fixing lint things

api/admin/step.go

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

api/deployment/get.go

@@ -66,6 +66,7 @@ func GetDeployment(c *gin.Context) {
 	u := user.Retrieve(c)
 	deployment := util.PathParameter(c, "deployment")
 	ctx := c.Request.Context()
+
 	var (
 		dep *library.Deployment
 		err error
@@ -103,7 +104,6 @@ func GetDeployment(c *gin.Context) {
 
 			return
 		}
-
 	} else {
 		dep = d
 	}

api/schedule/update.go

@@ -125,6 +125,7 @@ func UpdateSchedule(c *gin.Context) {
 
 	// set the updated by field using claims
 	s.SetUpdatedBy(u.GetName())
+
 	if input.GetBranch() != "" {
 		s.SetBranch(input.GetBranch())
 	}

cmd/vela-server/schedule.go

@@ -103,7 +103,7 @@ func processSchedules(ctx context.Context, start time.Time, compiler compiler.En
 		//
 		// The previous occurrence of the schedule must be after the starting time of processing schedules.
 		if !prevTime.After(start) {
-			logrus.Tracef("%s %s: previous occurence not after starting point", scheduleWait, schedule.GetName())
+			logrus.Tracef("%s %s: previous occurrence not after starting point", scheduleWait, schedule.GetName())
 
 			continue
 		}
@@ -277,6 +277,7 @@ func processSchedule(ctx context.Context, s *library.Schedule, compiler compiler
 			// parent should be "1" if it's the first build ran
 			b.SetParent(1)
 		}
+
 		r.SetCounter(r.GetCounter() + 1)
 
 		// set the build link if a web address is provided

database/database.go

@@ -61,8 +61,8 @@ type (
 		logger *logrus.Entry
 
 		build.BuildInterface
-		deployment.DeploymentInterface
 		executable.BuildExecutableInterface
+		deployment.DeploymentInterface
 		hook.HookInterface
 		log.LogInterface
 		pipeline.PipelineInterface

database/deployment/count.go

@@ -1,6 +1,4 @@
-// Copyright (c) 2022 Target Brands, Inc. All rights reserved.
-//
-// Use of this source code is governed by the LICENSE file in this repository.
+// SPDX-License-Identifier: Apache-2.0
 
 package deployment
 

database/deployment/count_repo.go

@@ -1,6 +1,4 @@
-// Copyright (c) 2022 Target Brands, Inc. All rights reserved.
-//
-// Use of this source code is governed by the LICENSE file in this repository.
+// SPDX-License-Identifier: Apache-2.0
 
 package deployment
 

database/deployment/create.go

@@ -1,6 +1,4 @@
-// Copyright (c) 2022 Target Brands, Inc. All rights reserved.
-//
-// Use of this source code is governed by the LICENSE file in this repository.
+// SPDX-License-Identifier: Apache-2.0
 
 package deployment
 

database/deployment/list.go

@@ -60,6 +60,7 @@ func (e *engine) ListDeployments(ctx context.Context) ([]*library.Deployment, er
 			if err2 != nil {
 				return nil, err
 			}
+
 			builds = append(builds, b.ToLibrary())
 		}
 

database/deployment/list_repo.go

@@ -65,6 +65,7 @@ func (e *engine) ListDeploymentsForRepo(ctx context.Context, r *library.Repo, pa
 			if err2 != nil {
 				return nil, err
 			}
+
 			builds = append(builds, b.ToLibrary())
 		}
 

database/deployment/list_repo_test.go

@@ -1,6 +1,4 @@
-// Copyright (c) 2023 Target Brands, Inc. All rights reserved.
-//
-// Use of this source code is governed by the LICENSE file in this repository.
+// SPDX-License-Identifier: Apache-2.0
 
 package deployment
 

database/deployment/list_test.go

@@ -1,6 +1,4 @@
-// Copyright (c) 2023 Target Brands, Inc. All rights reserved.
-//
-// Use of this source code is governed by the LICENSE file in this repository.
+// SPDX-License-Identifier: Apache-2.0
 
 package deployment
 

database/deployment/opts_test.go

@@ -1,6 +1,4 @@
-// Copyright (c) 2023 Target Brands, Inc. All rights reserved.
-//
-// Use of this source code is governed by the LICENSE file in this repository.
+// SPDX-License-Identifier: Apache-2.0
 
 package deployment
 

database/integration_test.go

@@ -400,6 +400,81 @@ func testBuilds(t *testing.T, db Interface, resources *Resources) {
 	}
 }
 
+func testExecutables(t *testing.T, db Interface, resources *Resources) {
+	// create a variable to track the number of methods called for pipelines
+	methods := make(map[string]bool)
+	// capture the element type of the pipeline interface
+	element := reflect.TypeOf(new(executable.BuildExecutableInterface)).Elem()
+	// iterate through all methods found in the pipeline interface
+	for i := 0; i < element.NumMethod(); i++ {
+		// skip tracking the methods to create indexes and tables for pipelines
+		// since those are already called when the database engine starts
+		if strings.Contains(element.Method(i).Name, "Index") ||
+			strings.Contains(element.Method(i).Name, "Table") {
+			continue
+		}
+
+		// add the method name to the list of functions
+		methods[element.Method(i).Name] = false
+	}
+
+	// create the pipelines
+	for _, executable := range resources.Executables {
+		err := db.CreateBuildExecutable(context.TODO(), executable)
+		if err != nil {
+			t.Errorf("unable to create executable %d: %v", executable.GetID(), err)
+		}
+	}
+	methods["CreateBuildExecutable"] = true
+
+	// pop executables for builds
+	for _, executable := range resources.Executables {
+		got, err := db.PopBuildExecutable(context.TODO(), executable.GetBuildID())
+		if err != nil {
+			t.Errorf("unable to get executable %d for build %d: %v", executable.GetID(), executable.GetBuildID(), err)
+		}
+		if !cmp.Equal(got, executable) {
+			t.Errorf("PopBuildExecutable() is %v, want %v", got, executable)
+		}
+	}
+	methods["PopBuildExecutable"] = true
+
+	resources.Builds[0].SetStatus(constants.StatusError)
+
+	_, err := db.UpdateBuild(context.TODO(), resources.Builds[0])
+	if err != nil {
+		t.Errorf("unable to update build for clean executables test")
+	}
+
+	err = db.CreateBuildExecutable(context.TODO(), resources.Executables[0])
+	if err != nil {
+		t.Errorf("unable to create executable %d: %v", resources.Executables[0].GetID(), err)
+	}
+
+	count, err := db.CleanBuildExecutables(context.TODO())
+	if err != nil {
+		t.Errorf("unable to clean executable %d: %v", resources.Executables[0].GetID(), err)
+	}
+
+	if count != 1 {
+		t.Errorf("CleanBuildExecutables should have affected 1 row, affected %d", count)
+	}
+
+	_, err = db.PopBuildExecutable(context.TODO(), resources.Builds[0].GetID())
+	if err == nil {
+		t.Errorf("build executable not cleaned")
+	}
+
+	methods["CleanBuildExecutables"] = true
+
+	// ensure we called all the methods we expected to
+	for method, called := range methods {
+		if !called {
+			t.Errorf("method %s was not called for pipelines", method)
+		}
+	}
+}
+
 func testDeployments(t *testing.T, db Interface, resources *Resources) {
 	// create a variable to track the number of methods called for deployments
 	methods := make(map[string]bool)
@@ -519,81 +594,6 @@ func testDeployments(t *testing.T, db Interface, resources *Resources) {
 	}
 }
 
-func testExecutables(t *testing.T, db Interface, resources *Resources) {
-	// create a variable to track the number of methods called for pipelines
-	methods := make(map[string]bool)
-	// capture the element type of the pipeline interface
-	element := reflect.TypeOf(new(executable.BuildExecutableInterface)).Elem()
-	// iterate through all methods found in the pipeline interface
-	for i := 0; i < element.NumMethod(); i++ {
-		// skip tracking the methods to create indexes and tables for pipelines
-		// since those are already called when the database engine starts
-		if strings.Contains(element.Method(i).Name, "Index") ||
-			strings.Contains(element.Method(i).Name, "Table") {
-			continue
-		}
-
-		// add the method name to the list of functions
-		methods[element.Method(i).Name] = false
-	}
-
-	// create the pipelines
-	for _, executable := range resources.Executables {
-		err := db.CreateBuildExecutable(context.TODO(), executable)
-		if err != nil {
-			t.Errorf("unable to create executable %d: %v", executable.GetID(), err)
-		}
-	}
-	methods["CreateBuildExecutable"] = true
-
-	// pop executables for builds
-	for _, executable := range resources.Executables {
-		got, err := db.PopBuildExecutable(context.TODO(), executable.GetBuildID())
-		if err != nil {
-			t.Errorf("unable to get executable %d for build %d: %v", executable.GetID(), executable.GetBuildID(), err)
-		}
-		if !cmp.Equal(got, executable) {
-			t.Errorf("PopBuildExecutable() is %v, want %v", got, executable)
-		}
-	}
-	methods["PopBuildExecutable"] = true
-
-	resources.Builds[0].SetStatus(constants.StatusError)
-
-	_, err := db.UpdateBuild(context.TODO(), resources.Builds[0])
-	if err != nil {
-		t.Errorf("unable to update build for clean executables test")
-	}
-
-	err = db.CreateBuildExecutable(context.TODO(), resources.Executables[0])
-	if err != nil {
-		t.Errorf("unable to create executable %d: %v", resources.Executables[0].GetID(), err)
-	}
-
-	count, err := db.CleanBuildExecutables(context.TODO())
-	if err != nil {
-		t.Errorf("unable to clean executable %d: %v", resources.Executables[0].GetID(), err)
-	}
-
-	if count != 1 {
-		t.Errorf("CleanBuildExecutables should have affected 1 row, affected %d", count)
-	}
-
-	_, err = db.PopBuildExecutable(context.TODO(), resources.Builds[0].GetID())
-	if err == nil {
-		t.Errorf("build executable not cleaned")
-	}
-
-	methods["CleanBuildExecutables"] = true
-
-	// ensure we called all the methods we expected to
-	for method, called := range methods {
-		if !called {
-			t.Errorf("method %s was not called for pipelines", method)
-		}
-	}
-}
-
 func testHooks(t *testing.T, db Interface, resources *Resources) {
 	// create a variable to track the number of methods called for hooks
 	methods := make(map[string]bool)

database/interface.go

@@ -36,12 +36,12 @@ type Interface interface {
 	// BuildInterface defines the interface for builds stored in the database.
 	build.BuildInterface
 
-	// DeploymentInterface defines the interface for deployments stored in the database.
-	deployment.DeploymentInterface
-
 	// BuildExecutableInterface defines the interface for build executables stored in the database.
 	executable.BuildExecutableInterface
 
+	// DeploymentInterface defines the interface for deployments stored in the database.
+	deployment.DeploymentInterface
+
 	// HookInterface defines the interface for hooks stored in the database.
 	hook.HookInterface
 

database/resource.go

@@ -35,17 +35,6 @@ func (e *engine) NewResources(ctx context.Context) error {
 		return err
 	}
 
-	// create the database agnostic engine for deployments
-	e.DeploymentInterface, err = deployment.New(
-		deployment.WithContext(e.ctx),
-		deployment.WithClient(e.client),
-		deployment.WithLogger(e.logger),
-		deployment.WithSkipCreation(e.config.SkipCreation),
-	)
-	if err != nil {
-		return err
-	}
-
 	// create the database agnostic engine for build_executables
 	e.BuildExecutableInterface, err = executable.New(
 		executable.WithContext(e.ctx),
@@ -59,6 +48,17 @@ func (e *engine) NewResources(ctx context.Context) error {
 		return err
 	}
 
+	// create the database agnostic engine for deployments
+	e.DeploymentInterface, err = deployment.New(
+		deployment.WithContext(e.ctx),
+		deployment.WithClient(e.client),
+		deployment.WithLogger(e.logger),
+		deployment.WithSkipCreation(e.config.SkipCreation),
+	)
+	if err != nil {
+		return err
+	}
+
 	// create the database agnostic engine for hooks
 	e.HookInterface, err = hook.New(
 		hook.WithContext(e.ctx),

router/middleware/logger.go

@@ -184,5 +184,6 @@ func (f *ECSFormatter) Format(e *logrus.Entry) ([]byte, error) {
 		TimestampFormat: "2006-01-02T15:04:05.000Z0700",
 		FieldMap:        ecsFieldMap,
 	}
+
 	return jf.Format(e)
 }

router/middleware/logger_test.go

@@ -224,7 +224,6 @@ func TestMiddleware_Logger_Sanitize(t *testing.T) {
 }
 
 func TestMiddleware_Format(t *testing.T) {
-
 	wantLabels := "labels.vela"
 
 	// setup data, fields, and logger
@@ -265,5 +264,4 @@ func TestMiddleware_Format(t *testing.T) {
 	if !strings.Contains(string(got), "/foobar") {
 		t.Errorf("Format returned %v, want to contain /foobar", string(got))
 	}
-
 }