chore: merge with main, broken

api/admin/clean.go

@@ -11,10 +11,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types"
-	"github.com/go-vela/types/constants"
 )
 
 // swagger:operation PUT /api/v1/admin/clean admin AdminCleanResources

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 {

api/admin/service.go

@@ -10,9 +10,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/service admin AdminUpdateService
@@ -59,7 +59,7 @@ func UpdateService(c *gin.Context) {
 	l.Debug("platform admin: updating service")
 
 	// capture body from API request
-	input := new(library.Service)
+	input := new(types.Service)
 
 	err := c.Bind(input)
 	if err != nil {

api/admin/step.go

@@ -10,9 +10,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/step admin AdminUpdateStep
@@ -58,7 +58,7 @@ func UpdateStep(c *gin.Context) {
 	l.Debug("platform admin: updating step")
 
 	// capture body from API request
-	input := new(library.Step)
+	input := new(types.Step)
 
 	err := c.Bind(input)
 	if err != nil {

api/admin/worker.go

@@ -9,10 +9,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation POST /api/v1/admin/workers/{worker}/register admin RegisterToken
@@ -72,5 +72,5 @@ func RegisterToken(c *gin.Context) {
 
 	l.Infof("platform admin: generated worker registration token for %s", host)
 
-	c.JSON(http.StatusOK, library.Token{Token: &rt})
+	c.JSON(http.StatusOK, types.Token{Token: &rt})
 }

api/auth/get_token.go

@@ -15,7 +15,6 @@ import (
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/scm"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation GET /authenticate authenticate GetAuthToken
@@ -175,7 +174,7 @@ func GetAuthToken(c *gin.Context) {
 		}).Info("new user created")
 
 		// return the jwt access token
-		c.JSON(http.StatusOK, library.Token{Token: &at})
+		c.JSON(http.StatusOK, types.Token{Token: &at})
 
 		return
 	}
@@ -213,5 +212,5 @@ func GetAuthToken(c *gin.Context) {
 	}).Info("user updated - new token")
 
 	// return the user with their jwt access token
-	c.JSON(http.StatusOK, library.Token{Token: &at})
+	c.JSON(http.StatusOK, types.Token{Token: &at})
 }

api/auth/logout.go

@@ -10,11 +10,11 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
 )
 
 // swagger:operation GET /logout authenticate GetLogout

api/auth/post_token.go

@@ -9,12 +9,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/scm"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation POST /authenticate/token authenticate PostAuthToken
@@ -98,5 +98,5 @@ func PostAuthToken(c *gin.Context) {
 	}
 
 	// return jwt access token
-	c.JSON(http.StatusOK, library.Token{Token: &at})
+	c.JSON(http.StatusOK, types.Token{Token: &at})
 }

api/auth/refresh.go

@@ -9,10 +9,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/router/middleware/auth"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation GET /token-refresh authenticate GetRefreshAccessToken
@@ -65,5 +65,5 @@ func RefreshAccessToken(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, library.Token{Token: &newAccessToken})
+	c.JSON(http.StatusOK, types.Token{Token: &newAccessToken})
 }

api/badge.go

@@ -8,10 +8,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/router/middleware/repo"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
 )
 
 // swagger:operation GET /badge/{org}/{repo}/status.svg base GetBadge

api/build/approve.go

@@ -12,14 +12,14 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/queue"
 	"github.com/go-vela/server/queue/models"
 	"github.com/go-vela/server/router/middleware/build"
 	"github.com/go-vela/server/router/middleware/repo"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
 )
 
 // swagger:operation POST /api/v1/repos/{org}/{repo}/builds/{build}/approve builds ApproveBuild

api/build/auto_cancel.go

@@ -16,9 +16,9 @@ import (
 
 	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/compiler/types/pipeline"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal/token"
-	"github.com/go-vela/types/constants"
 )
 
 // AutoCancel is a helper function that checks to see if any pending or running

api/build/auto_cancel_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/compiler/types/pipeline"
-	"github.com/go-vela/types/constants"
+	"github.com/go-vela/server/constants"
 )
 
 func Test_isCancelable(t *testing.T) {

api/build/cancel.go

@@ -13,14 +13,14 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/router/middleware/build"
 	"github.com/go-vela/server/router/middleware/executors"
 	"github.com/go-vela/server/router/middleware/repo"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
 )
 
 // swagger:operation DELETE /api/v1/repos/{org}/{repo}/builds/{build}/cancel builds CancelBuild

api/build/clean.go

@@ -10,15 +10,14 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/go-vela/server/api/types"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
-	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
 )
 
 // cleanBuild is a helper function to kill the build
 // without execution. This will kill all resources,
 // like steps and services, for the build.
-func CleanBuild(ctx context.Context, database database.Interface, b *types.Build, services []*library.Service, steps []*library.Step, e error) {
+func CleanBuild(ctx context.Context, database database.Interface, b *types.Build, services []*types.Service, steps []*types.Step, e error) {
 	l := logrus.WithFields(logrus.Fields{
 		"build":    b.GetNumber(),
 		"build_id": b.GetID(),

api/build/compile_publish.go

@@ -16,12 +16,12 @@ import (
 	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/compiler"
 	"github.com/go-vela/server/compiler/types/pipeline"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal"
 	"github.com/go-vela/server/queue"
 	"github.com/go-vela/server/queue/models"
 	"github.com/go-vela/server/scm"
-	"github.com/go-vela/types/constants"
 )
 
 // CompileAndPublishConfig is a struct that contains information for the CompileAndPublish function.

api/build/executable.go

@@ -17,7 +17,6 @@ import (
 	"github.com/go-vela/server/router/middleware/build"
 	"github.com/go-vela/server/router/middleware/repo"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation GET /api/v1/repos/{org}/{repo}/builds/{build}/executable builds GetBuildExecutable
@@ -106,7 +105,7 @@ func PublishBuildExecutable(ctx context.Context, db database.Interface, p *pipel
 	}
 
 	// create build executable to push to database
-	bExecutable := new(library.BuildExecutable)
+	bExecutable := new(types.BuildExecutable)
 	bExecutable.SetBuildID(b.GetID())
 	bExecutable.SetData(byteExecutable)
 

api/build/graph.go

@@ -11,17 +11,17 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/compiler"
 	"github.com/go-vela/server/compiler/types/pipeline"
+	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal"
 	"github.com/go-vela/server/router/middleware/build"
 	"github.com/go-vela/server/router/middleware/repo"
 	"github.com/go-vela/server/router/middleware/user"
 	"github.com/go-vela/server/scm"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/constants"
-	"github.com/go-vela/types/library"
 )
 
 // Graph contains nodes, and relationships between nodes, or edges.
@@ -46,10 +46,10 @@ type node struct {
 	Name    string `json:"name"`
 
 	// vela metadata
-	Status     string          `json:"status"`
-	StartedAt  int             `json:"started_at"`
-	FinishedAt int             `json:"finished_at"`
-	Steps      []*library.Step `json:"steps"`
+	Status     string        `json:"status"`
+	StartedAt  int           `json:"started_at"`
+	FinishedAt int           `json:"finished_at"`
+	Steps      []*types.Step `json:"steps"`
 
 	// unexported data used for building edges
 	Stage *pipeline.Stage `json:"-"`
@@ -67,7 +67,7 @@ type edge struct {
 
 // stg represents a stage's steps and some metadata for producing node/edge information.
 type stg struct {
-	steps []*library.Step
+	steps []*types.Step
 	// used for tracking stage status
 	success    int
 	running    int
@@ -241,7 +241,7 @@ func GetBuildGraph(c *gin.Context) {
 	}
 
 	// retrieve the steps for the build from the step table
-	steps := []*library.Step{}
+	steps := []*types.Step{}
 	page := 1
 	perPage := 100
 
@@ -279,7 +279,7 @@ func GetBuildGraph(c *gin.Context) {
 	}
 
 	// retrieve the services for the build from the service table
-	services := []*library.Service{}
+	services := []*types.Service{}
 	page = 1
 	perPage = 100
 
@@ -359,7 +359,7 @@ func GetBuildGraph(c *gin.Context) {
 		// initialize a stage tracker
 		if _, ok := stageMap[name]; !ok {
 			stageMap[name] = &stg{
-				steps: []*library.Step{},
+				steps: []*types.Step{},
 			}
 		}
 
@@ -615,13 +615,13 @@ func nodeFromStage(nodeID, cluster int, stage *pipeline.Stage, s *stg) *node {
 }
 
 // nodeFromService returns a new node from a service.
-func nodeFromService(nodeID int, service *library.Service) *node {
+func nodeFromService(nodeID int, service *types.Service) *node {
 	return &node{
 		ID:         nodeID,
 		Cluster:    ServiceCluster,
 		Name:       service.GetName(),
 		Stage:      nil,
-		Steps:      []*library.Step{},
+		Steps:      []*types.Step{},
 		Status:     service.GetStatus(),
 		StartedAt:  int(service.GetStarted()),
 		FinishedAt: int(service.GetFinished()),

api/build/id_request_token.go

@@ -12,11 +12,11 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
+	"github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/constants"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/router/middleware/build"
 	"github.com/go-vela/server/util"
-	"github.com/go-vela/types/library"
 )
 
 // swagger:operation GET /api/v1/repos/{org}/{repo}/builds/{build}/id_request_token builds GetIDRequestToken
@@ -145,5 +145,5 @@ func GetIDRequestToken(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, library.Token{Token: &idrt})
+	c.JSON(http.StatusOK, types.Token{Token: &idrt})
 }