refactor(secret): use server API types for secret (#1209)

go-vela · Oct 17, 2024 · 37f2c35 · 37f2c35
1 parent b0e091f
commit 37f2c35
Show file tree

Hide file tree

Showing 62 changed files with 2,152 additions and 473 deletions.
diff --git a/api/admin/secret.go b/api/admin/secret.go
@@ -9,9 +9,9 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation PUT /api/v1/admin/secret admin AdminUpdateSecret
@@ -57,7 +57,7 @@ func UpdateSecret(c *gin.Context) {
 	l.Debug("platform admin: updating secret")
 
 	// capture body from API request
-	input := new(library.Secret)
+	input := new(types.Secret)
 
 	err := c.Bind(input)
 	if err != nil {

diff --git a/api/secret/create.go b/api/secret/create.go
@@ -11,13 +11,13 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
+	"github.com/go-vela/server/api/types/actions"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/scm"
 	"github.com/go-vela/server/secret"
 	"github.com/go-vela/server/util"
 	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
-	"github.com/go-vela/types/library/actions"
 )
 
 // swagger:operation POST /api/v1/secrets/{engine}/{type}/{org}/{name} secrets CreateSecret
@@ -175,7 +175,7 @@ func CreateSecret(c *gin.Context) {
 	logger.Debugf("creating new secret %s for %s service", entry, e)
 
 	// capture body from API request
-	input := new(library.Secret)
+	input := new(types.Secret)
 
 	err := c.Bind(input)
 	if err != nil {
@@ -211,7 +211,7 @@ func CreateSecret(c *gin.Context) {
 
 	// default event set for secrets
 	if input.GetAllowEvents().ToDatabase() == 0 {
-		e := new(library.Events)
+		e := new(types.Events)
 
 		push := new(actions.Push)
 		push.SetBranch(true)

diff --git a/api/secret/list.go b/api/secret/list.go
@@ -12,12 +12,12 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/go-vela/server/api"
+	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/scm"
 	"github.com/go-vela/server/secret"
 	"github.com/go-vela/server/util"
 	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation GET /api/v1/secrets/{engine}/{type}/{org}/{name} secrets ListSecrets
@@ -195,7 +195,7 @@ func ListSecrets(c *gin.Context) {
 	pagination.SetHeaderLink(c)
 
 	// variable we want to return
-	secrets := []*library.Secret{}
+	secrets := []*types.Secret{}
 	// iterate through all secrets
 	for _, secret := range s {
 		// https://golang.org/doc/faq#closures_and_goroutines

diff --git a/api/secret/update.go b/api/secret/update.go
@@ -11,11 +11,11 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/secret"
 	"github.com/go-vela/server/util"
 	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
 )
 
 //
@@ -118,7 +118,7 @@ func UpdateSecret(c *gin.Context) {
 	l.WithFields(fields).Debugf("updating secret %s for %s service", entry, e)
 
 	// capture body from API request
-	input := new(library.Secret)
+	input := new(types.Secret)
 
 	err := c.Bind(input)
 	if err != nil {