Merge branch 'main' into refactor/jsonschema

.golangci.yml

@@ -80,10 +80,9 @@ linters:
     - bidichk # checks for dangerous unicode character sequences
     - bodyclose # checks whether HTTP response body is closed successfully
     - contextcheck # check the function whether use a non-inherited context
-    - dupl # code clone detection
+    - copyloopvar # checks for loop variables
     - errcheck # checks for unchecked errors
     - errorlint # find misuses of errors
-    - exportloopref # check for exported loop vars
     - funlen # detects long functions
     - gci # consistent import ordering
     - goconst # finds repeated strings that could be replaced by a constant
@@ -169,7 +168,6 @@ issues:
     # prevent linters from running on *_test.go files
     - path: _test\.go
       linters:
-        - dupl
         - funlen
         - goconst
         - gocyclo

api/admin/service.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code
 package admin
 
 import (

api/admin/step.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with user.go
 package admin
 
 import (

api/admin/user.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code
 package admin
 
 import (

api/build/enqueue.go

@@ -39,11 +39,11 @@ func Enqueue(ctx context.Context, queue queue.Service, db database.Interface, it
 	l.Debugf("pushing item for build to queue route %s", route)
 
 	// push item on to the queue
-	err = queue.Push(context.Background(), route, byteItem)
+	err = queue.Push(ctx, route, byteItem)
 	if err != nil {
 		l.Errorf("retrying; failed to publish build: %v", err)
 
-		err = queue.Push(context.Background(), route, byteItem)
+		err = queue.Push(ctx, route, byteItem)
 		if err != nil {
 			l.Errorf("failed to publish build: %v", err)
 

api/log/create_service.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code to step
 package log
 
 import (

api/log/create_step.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code to service
 package log
 
 import (

api/log/delete_service.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with step
 package log
 
 import (

api/log/delete_step.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with service
 package log
 
 import (

api/log/get_service.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with step
 package log
 
 import (

api/log/get_step.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with service
 package log
 
 import (

api/log/update_service.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with step
 package log
 
 import (

api/log/update_step.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with service
 package log
 
 import (

api/pipeline/compile.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with expand
 package pipeline
 
 import (

api/pipeline/expand.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with compile
 package pipeline
 
 import (

api/repo/repair.go

@@ -156,7 +156,7 @@ func RepairRepo(c *gin.Context) {
 			sourceRepo.SetPreviousName(r.GetName())
 		}
 
-		r, err = wh.RenameRepository(ctx, h, sourceRepo, c, m)
+		r, err = wh.RenameRepository(ctx, l, database.FromContext(c), h, sourceRepo, m)
 		if err != nil {
 			util.HandleError(c, http.StatusInternalServerError, err)
 			return

api/types/actions/deploy.go

@@ -1,6 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
-//
-//nolint:dupl // similar code to schedule.go
 package actions
 
 import "github.com/go-vela/server/constants"

api/types/actions/schedule.go

@@ -1,6 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
-//
-//nolint:dupl // similar code to deploy.go
 package actions
 
 import "github.com/go-vela/server/constants"

api/types/build.go

@@ -57,7 +57,7 @@ type Build struct {
 func (b *Build) Duration() string {
 	// check if the build doesn't have a started timestamp
 	if b.GetStarted() == 0 {
-		return "..."
+		return constants.ErrorEmptyDuration
 	}
 
 	// capture started unix timestamp from the build
@@ -1128,8 +1128,6 @@ func (b *Build) SetApprovedBy(v string) {
 }
 
 // String implements the Stringer interface for the Build type.
-//
-//nolint:dupl // this is duplicated in the test
 func (b *Build) String() string {
 	return fmt.Sprintf(`{
   ApprovedAt: %d,

api/types/service.go

@@ -37,7 +37,7 @@ type Service struct {
 func (s *Service) Duration() string {
 	// check if the service doesn't have a started timestamp
 	if s.GetStarted() == 0 {
-		return "..."
+		return constants.ErrorEmptyDuration
 	}
 
 	// capture started unix timestamp from the service

api/types/settings/compiler.go

@@ -7,7 +7,7 @@ import "fmt"
 type Compiler struct {
 	CloneImage        *string `json:"clone_image,omitempty"         yaml:"clone_image,omitempty"`
 	TemplateDepth     *int    `json:"template_depth,omitempty"      yaml:"template_depth,omitempty"`
-	StarlarkExecLimit *uint64 `json:"starlark_exec_limit,omitempty" yaml:"starlark_exec_limit,omitempty"`
+	StarlarkExecLimit *int64  `json:"starlark_exec_limit,omitempty" yaml:"starlark_exec_limit,omitempty"`
 }
 
 // GetCloneImage returns the CloneImage field.
@@ -40,7 +40,7 @@ func (cs *Compiler) GetTemplateDepth() int {
 //
 // When the provided Compiler type is nil, or the field within
 // the type is nil, it returns the zero value for the field.
-func (cs *Compiler) GetStarlarkExecLimit() uint64 {
+func (cs *Compiler) GetStarlarkExecLimit() int64 {
 	// return zero value if Compiler type or StarlarkExecLimit field is nil
 	if cs == nil || cs.StarlarkExecLimit == nil {
 		return 0
@@ -79,7 +79,7 @@ func (cs *Compiler) SetTemplateDepth(v int) {
 //
 // When the provided Compiler type is nil, it
 // will set nothing and immediately return.
-func (cs *Compiler) SetStarlarkExecLimit(v uint64) {
+func (cs *Compiler) SetStarlarkExecLimit(v int64) {
 	// return if Compiler type is nil
 	if cs == nil {
 		return

api/types/step.go

@@ -39,7 +39,7 @@ type Step struct {
 func (s *Step) Duration() string {
 	// check if the step doesn't have a started timestamp
 	if s.GetStarted() == 0 {
-		return "..."
+		return constants.ErrorEmptyDuration
 	}
 
 	// capture started unix timestamp from the step

api/types/template.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore false positive with build_queue.go
 package types
 
 import (

api/user/create_token.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with delete token
 package user
 
 import (

api/user/delete_token.go

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:dupl // ignore similar code with create token
 package user
 
 import (