darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Integrated real API implementation for org secrets

Browse source
This commit is contained in:
Thomas Boerger 2016-07-31 22:58:29 +02:00
parent 889b88d38f
commit 298dcd5a50
No known key found for this signature in database
GPG key ID: 5A388F55283960B6
4 changed files with 71 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/build.go
View file

@ -291,7 +291,7 @@ func PostBuild(c *gin.Context) {
// get the previous build so that we can send
// on status change notifications
last, _ := store.GetBuildLastBefore(c, repo, build.Branch, build.ID)
secs, err := store.GetSecretList(c, repo)
secs, err := store.GetMergedSecretList(c, repo)
if err != nil {
log.Errorf("Error getting secrets for %s#%d. %s", repo.FullName, build.Number, err)
}

2
server/hook.go
View file

@ -206,7 +206,7 @@ func PostHook(c *gin.Context) {
// get the previous build so that we can send
// on status change notifications
last, _ := store.GetBuildLastBefore(c, repo, build.Branch, build.ID)
secs, err := store.GetSecretList(c, repo)
secs, err := store.GetMergedSecretList(c, repo)
if err != nil {
log.Errorf("Error getting secrets for %s#%d. %s", repo.FullName, build.Number, err)
}

23
server/secret.go → server/repo_secret.go
View file

@ -19,7 +19,7 @@ func GetSecrets(c *gin.Context) {
return
}
var list []*model.Secret
var list []*model.RepoSecret
for _, s := range secrets {
list = append(list, s.Clone())
@ -28,19 +28,10 @@ func GetSecrets(c *gin.Context) {
c.JSON(http.StatusOK, list)
}
func GetTeamSecrets(c *gin.Context) {
var (
list []*model.Secret
)
// TODO(must): Integrate a real implementation
c.JSON(http.StatusOK, list)
}
func PostSecret(c *gin.Context) {
repo := session.Repo(c)
in := &model.Secret{}
in := &model.RepoSecret{}
err := c.Bind(in)
if err != nil {
c.String(http.StatusBadRequest, "Invalid JSON input. %s", err.Error())
@ -58,11 +49,6 @@ func PostSecret(c *gin.Context) {
c.String(http.StatusOK, "")
}
func PostTeamSecret(c *gin.Context) {
c.String(http.StatusOK, "")
// TODO(must): Integrate a real implementation
}
func DeleteSecret(c *gin.Context) {
repo := session.Repo(c)
name := c.Param("secret")
@ -80,8 +66,3 @@ func DeleteSecret(c *gin.Context) {
c.String(http.StatusOK, "")
}
func DeleteTeamSecret(c *gin.Context) {
c.String(http.StatusOK, "")
// TODO(must): Integrate a real implementation
}

67
server/team_secret.go Normal file
View file

@ -0,0 +1,67 @@
package server
import (
"net/http"
"github.com/drone/drone/model"
"github.com/drone/drone/store"
"github.com/gin-gonic/gin"
)
func GetTeamSecrets(c *gin.Context) {
team := c.Param("team")
secrets, err := store.GetTeamSecretList(c, team)
if err != nil {
c.AbortWithStatus(http.StatusInternalServerError)
return
}
var list []*model.TeamSecret
for _, s := range secrets {
list = append(list, s.Clone())
}
c.JSON(http.StatusOK, list)
}
func PostTeamSecret(c *gin.Context) {
team := c.Param("team")
in := &model.TeamSecret{}
err := c.Bind(in)
if err != nil {
c.String(http.StatusBadRequest, "Invalid JSON input. %s", err.Error())
return
}
in.ID = 0
in.Key = team
err = store.SetTeamSecret(c, in)
if err != nil {
c.String(http.StatusInternalServerError, "Unable to persist team secret. %s", err.Error())
return
}
c.String(http.StatusOK, "")
}
func DeleteTeamSecret(c *gin.Context) {
team := c.Param("team")
name := c.Param("secret")
secret, err := store.GetTeamSecret(c, team, name)
if err != nil {
c.String(http.StatusNotFound, "Cannot find secret %s.", name)
return
}
err = store.DeleteTeamSecret(c, secret)
if err != nil {
c.String(http.StatusInternalServerError, "Unable to delete team secret. %s", err.Error())
return
}
c.String(http.StatusOK, "")
}