sec/golangci

.gitignore

@@ -17,6 +17,7 @@ api/public/**/*
 /runner.json
 /runner.token
 /runner.key
+/runner.registration_token
 /.dredd/config.json
 /database.boltdb
 /database.sqlite

api/api_test.go

@@ -1,10 +1,11 @@
 package api
 
 import (
-	"github.com/semaphoreui/semaphore/util"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/semaphoreui/semaphore/util"
 )
 
 func TestApiPing(t *testing.T) {

api/apps.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"reflect"
+	"sort"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/pkg/conv"
 	"github.com/semaphoreui/semaphore/util"
-	"net/http"
-	"reflect"
-	"sort"
 )
 
 func validateAppID(str string) error {

api/apps_test.go

@@ -2,8 +2,9 @@ package api
 
 import (
 	"fmt"
-	"github.com/semaphoreui/semaphore/pkg/conv"
 	"testing"
+
+	"github.com/semaphoreui/semaphore/pkg/conv"
 )
 
 func TestStructToMap(t *testing.T) {

api/cache.go

@@ -1,11 +1,12 @@
 package api
 
 import (
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/util"
 	log "github.com/sirupsen/logrus"
-	"net/http"
 )
 
 func clearCache(w http.ResponseWriter, r *http.Request) {

api/events.go

@@ -1,9 +1,10 @@
 package api
 
 import (
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
-	"net/http"
 )
 
 // nolint: gocyclo

api/helpers/event_log.go

@@ -1,10 +1,11 @@
 package helpers
 
 import (
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/pro_interfaces"
 	log "github.com/sirupsen/logrus"
-	"net/http"
 )
 
 type EventLogItem struct {

api/helpers/helpers_test.go

@@ -13,12 +13,21 @@ import (
 // SetTestDelay sets a delay for testing slow network conditions
 func SetTestDelay(delay time.Duration) func() {
 	originalDelay := os.Getenv("DEBUG_DELAY")
-	os.Setenv("DEBUG_DELAY", delay.String())
+	err := os.Setenv("DEBUG_DELAY", delay.String())
+
+	if err != nil {
+		panic("Failed to set DEBUG_DELAY environment variable: " + err.Error())
+	}
+
 	return func() {
 		if originalDelay == "" {
-			os.Unsetenv("DEBUG_DELAY")
+			err = os.Unsetenv("DEBUG_DELAY")
 		} else {
-			os.Setenv("DEBUG_DELAY", originalDelay)
+			err = os.Setenv("DEBUG_DELAY", originalDelay)
+		}
+
+		if err != nil {
+			panic("Failed to unset DEBUG_DELAY environment variable: " + err.Error())
 		}
 	}
 }

api/helpers/query_params.go

@@ -1,10 +1,11 @@
 package helpers
 
 import (
-	"github.com/semaphoreui/semaphore/db"
 	"net/url"
 	"slices"
 	"strconv"
+
+	"github.com/semaphoreui/semaphore/db"
 )
 
 func QueryParamsForProps(url *url.URL, props db.ObjectProps) (params db.RetrieveQueryParams) {

api/integration_test.go

@@ -401,7 +401,10 @@ func TestGetTaskDefinitionWithExtractedEnvValues(t *testing.T) {
 	env1 := make(map[string]any)
 
 	if taskDef1.Environment != "" {
-		json.Unmarshal([]byte(taskDef1.Environment), &env1)
+		err := json.Unmarshal([]byte(taskDef1.Environment), &env1)
+		if err != nil {
+			t.Fatalf("Failed to unmarshal environment: %v", err)
+		}
 	}
 
 	// Add extracted environment variables only if they don't conflict with
@@ -417,7 +420,9 @@ func TestGetTaskDefinitionWithExtractedEnvValues(t *testing.T) {
 
 	// Verify that extracted values ARE now in the environment
 	var envCheck1 map[string]any
-	json.Unmarshal([]byte(taskDef1.Environment), &envCheck1)
+	if err := json.Unmarshal([]byte(taskDef1.Environment), &envCheck1); err != nil {
+		t.Fatalf("Failed to unmarshal environment: %v", err)
+	}
 
 	if envCheck1["BRANCH_NAME"] != "main" {
 		t.Errorf("Expected BRANCH_NAME to be 'main' in environment, got '%v'", envCheck1["BRANCH_NAME"])
@@ -441,7 +446,9 @@ func TestGetTaskDefinitionWithExtractedEnvValues(t *testing.T) {
 	env2 := make(map[string]any)
 
 	if taskDef2.Environment != "" {
-		json.Unmarshal([]byte(taskDef2.Environment), &env2)
+		if err := json.Unmarshal([]byte(taskDef2.Environment), &env2); err != nil {
+			t.Fatalf("Failed to unmarshal environment: %v", err)
+		}
 	}
 
 	// Add extracted environment variables only if they don't conflict with
@@ -457,7 +464,9 @@ func TestGetTaskDefinitionWithExtractedEnvValues(t *testing.T) {
 
 	// Verify that both existing and extracted values are in the environment
 	var envCheck2 map[string]any
-	json.Unmarshal([]byte(taskDef2.Environment), &envCheck2)
+	if err := json.Unmarshal([]byte(taskDef2.Environment), &envCheck2); err != nil {
+		t.Fatalf("Failed to unmarshal environment: %v", err)
+	}
 
 	if envCheck2["EXISTING_VAR"] != "existing_value" {
 		t.Errorf("Expected EXISTING_VAR to be 'existing_value' in environment, got '%v'", envCheck2["EXISTING_VAR"])
@@ -484,7 +493,9 @@ func TestGetTaskDefinitionWithExtractedEnvValues(t *testing.T) {
 	env3 := make(map[string]any)
 
 	if taskDef3.Environment != "" {
-		json.Unmarshal([]byte(taskDef3.Environment), &env3)
+		if err := json.Unmarshal([]byte(taskDef3.Environment), &env3); err != nil {
+			t.Fatalf("Failed to unmarshal environment: %v", err)
+		}
 	}
 
 	// Add extracted environment variables only if they don't conflict with
@@ -500,7 +511,9 @@ func TestGetTaskDefinitionWithExtractedEnvValues(t *testing.T) {
 
 	// Verify that task definition values take precedence over extracted values
 	var envCheck3 map[string]any
-	json.Unmarshal([]byte(taskDef3.Environment), &envCheck3)
+	if err := json.Unmarshal([]byte(taskDef3.Environment), &envCheck3); err != nil {
+		t.Fatalf("Failed to unmarshal environment: %v", err)
+	}
 
 	// BRANCH_NAME should remain "production" from task definition, not "main" from extracted
 	if envCheck3["BRANCH_NAME"] != "production" {

api/options.go

@@ -1,9 +1,10 @@
 package api
 
 import (
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
-	"net/http"
 )
 
 func setOption(w http.ResponseWriter, r *http.Request) {

api/projects/backup_restore.go

@@ -1,11 +1,12 @@
 package projects
 
 import (
-	"github.com/semaphoreui/semaphore/util"
 	"io"
 	"net/http"
 	"strings"
 
+	"github.com/semaphoreui/semaphore/util"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
 	projectService "github.com/semaphoreui/semaphore/services/project"

api/projects/integration_alias.go

@@ -1,11 +1,12 @@
 package projects
 
 import (
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/pkg/random"
 	"github.com/semaphoreui/semaphore/util"
-	"net/http"
 )
 
 type publicAlias struct {

api/projects/inventory.go

@@ -213,7 +213,7 @@ func UpdateInventory(w http.ResponseWriter, r *http.Request) {
 // RemoveInventory deletes an inventory from the database
 func RemoveInventory(w http.ResponseWriter, r *http.Request) {
 	inventory := helpers.GetFromContext(r, "inventory").(db.Inventory)
-	var err error = helpers.Store(r).DeleteInventory(inventory.ProjectID, inventory.ID)
+	err := helpers.Store(r).DeleteInventory(inventory.ProjectID, inventory.ID)
 	if errors.Is(err, db.ErrInvalidOperation) {
 		helpers.WriteJSON(w, http.StatusBadRequest, map[string]any{
 			"error": "Inventory is in use by one or more templates",

api/projects/repository.go

@@ -3,11 +3,12 @@ package projects
 import (
 	"errors"
 	"fmt"
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/db_lib"
 	"github.com/semaphoreui/semaphore/util"
-	"net/http"
 )
 
 // RepositoryMiddleware ensures a repository exists and loads it to the context
@@ -187,7 +188,7 @@ func UpdateRepository(w http.ResponseWriter, r *http.Request) {
 func RemoveRepository(w http.ResponseWriter, r *http.Request) {
 	repository := helpers.GetFromContext(r, "repository").(db.Repository)
 
-	var err error = helpers.Store(r).DeleteRepository(repository.ProjectID, repository.ID)
+	err := helpers.Store(r).DeleteRepository(repository.ProjectID, repository.ID)
 	if errors.Is(err, db.ErrInvalidOperation) {
 		helpers.WriteJSON(w, http.StatusBadRequest, map[string]any{
 			"error": "Repository is in use by one or more templates",

api/router.go

@@ -17,7 +17,6 @@ import (
 	"github.com/semaphoreui/semaphore/services/server"
 	taskServices "github.com/semaphoreui/semaphore/services/tasks"
 
-	"github.com/semaphoreui/semaphore/api/debug"
 	"github.com/semaphoreui/semaphore/api/tasks"
 	"github.com/semaphoreui/semaphore/pkg/tz"
 	log "github.com/sirupsen/logrus"
@@ -221,10 +220,6 @@ func Route(
 
 	adminAPI.Path("/cache").HandlerFunc(clearCache).Methods("DELETE", "HEAD")
 
-	debugAPI := adminAPI.PathPrefix("/debug").Subrouter()
-	debugAPI.Path("/gc").HandlerFunc(debug.GC).Methods("POST")
-	debugAPI.Path("/pprof/dump").HandlerFunc(debug.Dump).Methods("POST")
-
 	globalRunnersAPI := adminAPI.PathPrefix("/runners").Subrouter()
 	globalRunnersAPI.Use(globalRunnerMiddleware)
 	globalRunnersAPI.Path("/{runner_id}").HandlerFunc(getGlobalRunner).Methods("GET", "HEAD")