chore(code): clean up the code EE-5719 (#9183)

api/chisel/schedules.go

@@ -18,6 +18,7 @@ func (service *Service) AddEdgeJob(endpoint *portainer.Endpoint, edgeJob *portai
 	for idx, existingJob := range tunnel.Jobs {
 		if existingJob.ID == edgeJob.ID {
 			existingJobIndex = idx
+
 			break
 		}
 	}

api/cmd/portainer/main.go

@@ -152,7 +152,7 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
 	return store
 }
 
-func initComposeStackManager(composeDeployer libstack.Deployer, reverseTunnelService portainer.ReverseTunnelService, proxyManager *proxy.Manager) portainer.ComposeStackManager {
+func initComposeStackManager(composeDeployer libstack.Deployer, proxyManager *proxy.Manager) portainer.ComposeStackManager {
 	composeWrapper, err := exec.NewComposeStackManager(composeDeployer, proxyManager)
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed creating compose manager")
@@ -458,7 +458,7 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server {
 		log.Fatal().Err(err).Msg("failed initializing compose deployer")
 	}
 
-	composeStackManager := initComposeStackManager(composeDeployer, reverseTunnelService, proxyManager)
+	composeStackManager := initComposeStackManager(composeDeployer, proxyManager)
 
 	swarmStackManager, err := initSwarmStackManager(*flags.Assets, dockerConfigPath, digitalSignatureService, fileService, reverseTunnelService, dataStore)
 	if err != nil {

api/dataservices/endpoint/tx.go

@@ -66,6 +66,7 @@ func (service ServiceTx) DeleteEndpoint(ID portainer.EndpointID) error {
 	for edgeID, endpointID := range service.service.idxEdgeID {
 		if endpointID == ID {
 			delete(service.service.idxEdgeID, edgeID)
+
 			break
 		}
 	}

api/datastore/migrator/migrate_dbversion100.go

@@ -20,10 +20,6 @@ func (m *Migrator) migrateDockerDesktopExtentionSetting() error {
 	}
 
 	settings.IsDockerDesktopExtension = isDDExtension
-	err = m.settingsService.UpdateSettings(settings)
-	if err != nil {
-		return err
-	}
 
-	return nil
+	return m.settingsService.UpdateSettings(settings)
 }

api/datastore/migrator/migrator.go

@@ -3,15 +3,11 @@ package migrator
 import (
 	"errors"
 
-	"github.com/portainer/portainer/api/dataservices/edgejob"
-	"github.com/portainer/portainer/api/dataservices/edgestack"
-
-	"github.com/Masterminds/semver"
-	"github.com/rs/zerolog/log"
-
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/database/models"
 	"github.com/portainer/portainer/api/dataservices/dockerhub"
+	"github.com/portainer/portainer/api/dataservices/edgejob"
+	"github.com/portainer/portainer/api/dataservices/edgestack"
 	"github.com/portainer/portainer/api/dataservices/endpoint"
 	"github.com/portainer/portainer/api/dataservices/endpointgroup"
 	"github.com/portainer/portainer/api/dataservices/endpointrelation"
@@ -29,6 +25,9 @@ import (
 	"github.com/portainer/portainer/api/dataservices/user"
 	"github.com/portainer/portainer/api/dataservices/version"
 	"github.com/portainer/portainer/api/internal/authorization"
+
+	"github.com/Masterminds/semver"
+	"github.com/rs/zerolog/log"
 )
 
 type (

api/docker/images/registry.go

@@ -4,22 +4,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/patrickmn/go-cache"
-	"github.com/pkg/errors"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
 	"github.com/portainer/portainer/api/internal/registryutils"
+
+	"github.com/patrickmn/go-cache"
+	"github.com/pkg/errors"
 )
 
-var (
+var registriesCache = cache.New(5*time.Minute, 5*time.Minute)
-	_registriesCache = cache.New(5*time.Minute, 5*time.Minute)
-)
 
-type (
+type RegistryClient struct {
-	RegistryClient struct {
+	dataStore dataservices.DataStore
-		dataStore dataservices.DataStore
+}
-	}
-)
 
 func NewRegistryClient(dataStore dataservices.DataStore) *RegistryClient {
 	return &RegistryClient{dataStore: dataStore}
@@ -130,12 +127,14 @@ func findBestMatchRegistry(repository string, registries []portainer.Registry) (
 	if match == nil {
 		return nil, errors.New("no registries matched")
 	}
-	_registriesCache.Set(repository, match, 0)
+
+	registriesCache.Set(repository, match, 0)
+
 	return match, nil
 }
 
 func cachedRegistry(cacheKey string) (*portainer.Registry, error) {
-	r, ok := _registriesCache.Get(cacheKey)
+	r, ok := registriesCache.Get(cacheKey)
 	if ok {
 		registry, ok := r.(portainer.Registry)
 		if ok {

api/docker/images/status.go

@@ -7,12 +7,12 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/opencontainers/go-digest"
-	"github.com/patrickmn/go-cache"
 	portainer "github.com/portainer/portainer/api"
 	consts "github.com/portainer/portainer/api/docker/consts"
 	"github.com/portainer/portainer/api/internal/slices"
 
+	"github.com/opencontainers/go-digest"
+	"github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 )
@@ -40,6 +40,7 @@ func (c *DigestClient) ContainersImageStatus(ctx context.Context, containers []t
 	cli, err := c.clientFactory.CreateClient(endpoint, "", nil)
 	if err != nil {
 		log.Error().Err(err).Msg("cannot create docker client")
+
 		return Error
 	}
 

api/filesystem/filesystem.go

@@ -6,15 +6,15 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
+	"io"
+	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/gofrs/uuid"
 	portainer "github.com/portainer/portainer/api"
-	"github.com/rs/zerolog/log"
 
-	"io"
+	"github.com/gofrs/uuid"
-	"os"
+	"github.com/rs/zerolog/log"
 )
 
 const (
@@ -327,7 +327,7 @@ func (service *Service) GetEdgeStackProjectPathByVersion(edgeStackIdentifier str
 	}
 
 	if commitHash != "" {
-		versionStr = fmt.Sprintf("%s", commitHash)
+		versionStr = commitHash
 	}
 
 	return JoinPaths(service.wrapFileStore(EdgeStackStorePath), edgeStackIdentifier, versionStr)
@@ -367,7 +367,7 @@ func (service *Service) FormProjectPathByVersion(path string, version int, commi
 	}
 
 	if commitHash != "" {
-		versionStr = fmt.Sprintf("%s", commitHash)
+		versionStr = commitHash
 	}
 
 	return JoinPaths(path, versionStr)

api/filesystem/filesystem_move_test.go

@@ -8,6 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+var content = []byte("content")
+
 func Test_movePath_shouldFailIfSourceDirDoesNotExist(t *testing.T) {
 	sourceDir := "missing"
 	destinationDir := t.TempDir()
@@ -52,8 +54,6 @@ func Test_movePath_successWhenSourceExistsAndDestinationIsMissing(t *testing.T)
 	assertFileContent(t, path.Join(destinationDir, "dir", "file"))
 }
 
-var content []byte = []byte("content")
-
 func addFile(fileParts ...string) (filepath string) {
 	if len(fileParts) > 2 {
 		dir := path.Join(fileParts[:len(fileParts)-1]...)
@@ -62,6 +62,7 @@ func addFile(fileParts ...string) (filepath string) {
 
 	p := path.Join(fileParts...)
 	os.WriteFile(p, content, 0766)
+
 	return p
 }
 

api/git/git_test.go

@@ -6,11 +6,12 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/portainer/portainer/api/archive"
+	gittypes "github.com/portainer/portainer/api/git/types"
+
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/pkg/errors"
-	"github.com/portainer/portainer/api/archive"
-	gittypes "github.com/portainer/portainer/api/git/types"
 	"github.com/stretchr/testify/assert"
 )
 

api/http/handler/customtemplates/customtemplate_git_fetch.go

@@ -11,6 +11,7 @@ import (
 	"github.com/portainer/libhttp/response"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/stacks/stackutils"
+
 	"github.com/rs/zerolog/log"
 )
 
@@ -68,10 +69,12 @@ func (handler *Handler) customTemplateGitFetch(w http.ResponseWriter, r *http.Re
 	})
 	if err != nil {
 		log.Warn().Err(err).Msg("failed to download git repository")
-		rbErr := rollbackCustomTemplate(backupPath, customTemplate.ProjectPath)
+
 		if err != nil {
+			rbErr := rollbackCustomTemplate(backupPath, customTemplate.ProjectPath)
 			return httperror.InternalServerError("Failed to rollback the custom template folder", rbErr)
 		}
+
 		return httperror.InternalServerError("Failed to download git repository", err)
 	}
 
@@ -104,11 +107,7 @@ func backupCustomTemplate(projectPath string) (string, error) {
 		return "", err
 	}
 
-	err = os.Mkdir(projectPath, stat.Mode())
+	return backupPath, os.Mkdir(projectPath, stat.Mode())
-	if err != nil {
-		return backupPath, err
-	}
-	return backupPath, nil
 }
 
 func rollbackCustomTemplate(backupPath, projectPath string) error {
@@ -116,6 +115,7 @@ func rollbackCustomTemplate(backupPath, projectPath string) error {
 	if err != nil {
 		return err
 	}
+
 	return os.Rename(backupPath, projectPath)
 }
 

api/http/handler/customtemplates/customtemplate_git_fetch_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-var testFileContent string = "abcdefg"
+var testFileContent = "abcdefg"
 
 type TestGitService struct {
 	portainer.GitService
@@ -32,6 +32,7 @@ type TestGitService struct {
 
 func (g *TestGitService) CloneRepository(destination string, repositoryURL, referenceName string, username, password string, tlsSkipVerify bool) error {
 	time.Sleep(100 * time.Millisecond)
+
 	return createTestFile(g.targetFilePath)
 }
 
@@ -53,7 +54,9 @@ func createTestFile(targetPath string) error {
 		return err
 	}
 	defer f.Close()
+
 	_, err = f.WriteString(testFileContent)
+
 	return err
 }
 
@@ -152,7 +155,7 @@ func Test_customTemplateGitFetch(t *testing.T) {
 		wg.Add(10)
 		for i := 0; i < 10; i++ {
 			go func(j int) {
-				if j%1 == 0 {
+				if j%2 == 0 {
 					singleAPIRequest(h, jwt1, is, "abcdefg")
 				} else {
 					singleAPIRequest(h, jwt2, is, "abcdefg")

api/http/handler/kubernetes/config.go

@@ -38,6 +38,7 @@ func (handler *Handler) getKubernetesConfig(w http.ResponseWriter, r *http.Reque
 	if err != nil {
 		return httperror.Forbidden("Permission denied to access environment", err)
 	}
+
 	bearerToken, err := handler.JwtService.GenerateTokenForKubeconfig(tokenData)
 	if err != nil {
 		return httperror.InternalServerError("Unable to generate JWT token", err)
@@ -47,14 +48,12 @@ func (handler *Handler) getKubernetesConfig(w http.ResponseWriter, r *http.Reque
 	if handlerErr != nil {
 		return handlerErr
 	}
+
 	if len(endpoints) == 0 {
 		return httperror.BadRequest("empty endpoints list", errors.New("empty endpoints list"))
 	}
 
-	config, handlerErr := handler.buildConfig(r, tokenData, bearerToken, endpoints, false)
+	config := handler.buildConfig(r, tokenData, bearerToken, endpoints, false)
-	if handlerErr != nil {
-		return handlerErr
-	}
 
 	return writeFileContent(w, r, endpoints, tokenData, config)
 }
@@ -92,7 +91,9 @@ func (handler *Handler) filterUserKubeEndpoints(r *http.Request) ([]portainer.En
 			}
 			endpoints = append(endpoints, *endpoint)
 		}
+
 		filteredEndpoints := security.FilterEndpoints(endpoints, endpointGroups, securityContext)
+
 		return filteredEndpoints, nil
 	}
 
@@ -101,10 +102,12 @@ func (handler *Handler) filterUserKubeEndpoints(r *http.Request) ([]portainer.En
 	if err != nil {
 		return nil, httperror.InternalServerError("Unable to retrieve environments from the database", err)
 	}
+
 	for _, endpoint := range endpoints {
 		if !endpointutils.IsKubernetesEndpoint(&endpoint) {
 			continue
 		}
+
 		kubeEndpoints = append(kubeEndpoints, endpoint)
 	}
 
@@ -112,13 +115,15 @@ func (handler *Handler) filterUserKubeEndpoints(r *http.Request) ([]portainer.En
 	if len(excludeEndpointIDs) > 0 {
 		filteredEndpoints = endpointutils.FilterByExcludeIDs(filteredEndpoints, excludeEndpointIDs)
 	}
+
 	return filteredEndpoints, nil
 }
 
-func (handler *Handler) buildConfig(r *http.Request, tokenData *portainer.TokenData, bearerToken string, endpoints []portainer.Endpoint, isInternal bool) (*clientV1.Config, *httperror.HandlerError) {
+func (handler *Handler) buildConfig(r *http.Request, tokenData *portainer.TokenData, bearerToken string, endpoints []portainer.Endpoint, isInternal bool) *clientV1.Config {
+	var configAuthInfos []clientV1.NamedAuthInfo
+
 	configClusters := make([]clientV1.NamedCluster, len(endpoints))
 	configContexts := make([]clientV1.NamedContext, len(endpoints))
-	var configAuthInfos []clientV1.NamedAuthInfo
 	authInfosSet := make(map[string]bool)
 
 	for idx, endpoint := range endpoints {
@@ -127,6 +132,7 @@ func (handler *Handler) buildConfig(r *http.Request, tokenData *portainer.TokenD
 
 		configClusters[idx] = handler.buildCluster(r, endpoint, isInternal)
 		configContexts[idx] = buildContext(serviceAccountName, endpoint)
+
 		if !authInfosSet[serviceAccountName] {
 			configAuthInfos = append(configAuthInfos, buildAuthInfo(serviceAccountName, bearerToken))
 			authInfosSet[serviceAccountName] = true
@@ -140,7 +146,7 @@ func (handler *Handler) buildConfig(r *http.Request, tokenData *portainer.TokenD
 		Contexts:       configContexts,
 		CurrentContext: configContexts[0].Name,
 		AuthInfos:      configAuthInfos,
-	}, nil
+	}
 }
 
 // buildCluster builds a Kubernetes cluster configuration based on the endpoint and if it's used internally or externally.

api/http/handler/kubernetes/handler.go

@@ -166,22 +166,13 @@ func (handler *Handler) kubeClient(next http.Handler) http.Handler {
 		singleEndpointList := []portainer.Endpoint{
 			*endpoint,
 		}
-		config, handlerErr := handler.buildConfig(
+		config := handler.buildConfig(
 			r,
 			tokenData,
 			bearerToken,
 			singleEndpointList,
 			true,
 		)
-		if err != nil {
-			httperror.WriteError(
-				w,
-				http.StatusInternalServerError,
-				"Unable to build endpoint kubeconfig",
-				handlerErr.Err,
-			)
-			return
-		}
 
 		if len(config.Clusters) == 0 {
 			httperror.WriteError(

api/http/models/kubernetes/ingress.go

@@ -59,9 +59,11 @@ func (r K8sIngressInfo) Validate(request *http.Request) error {
 	if r.Name == "" {
 		return errors.New("missing ingress name from the request payload")
 	}
+
 	if r.Namespace == "" {
 		return errors.New("missing ingress Namespace from the request payload")
 	}
+
 	return nil
 }
 
@@ -69,10 +71,12 @@ func (r K8sIngressDeleteRequests) Validate(request *http.Request) error {
 	if len(r) == 0 {
 		return errors.New("missing deletion request list in payload")
 	}
+
 	for ns := range r {
 		if len(ns) == 0 {
 			return errors.New("deletion given with empty namespace")
 		}
 	}
+
 	return nil
 }

api/http/models/kubernetes/services.go

@@ -48,12 +48,15 @@ func (s *K8sServiceInfo) Validate(request *http.Request) error {
 	if s.Name == "" {
 		return errors.New("missing service name from the request payload")
 	}
+
 	if s.Namespace == "" {
 		return errors.New("missing service namespace from the request payload")
 	}
+
 	if s.Ports == nil {
 		return errors.New("missing service ports from the request payload")
 	}
+
 	return nil
 }
 
@@ -61,10 +64,12 @@ func (r K8sServiceDeleteRequests) Validate(request *http.Request) error {
 	if len(r) == 0 {
 		return errors.New("missing deletion request list in payload")
 	}
+
 	for ns := range r {
 		if len(ns) == 0 {
 			return errors.New("deletion given with empty namespace")
 		}
 	}
+
 	return nil
 }

api/http/proxy/factory/kubernetes/deployments.go

@@ -8,8 +8,7 @@ func (transport *baseTransport) proxyDeploymentsRequest(request *http.Request, n
 	switch request.Method {
 	case http.MethodPost, http.MethodPatch:
 		transport.refreshRegistry(request, namespace)
-		return transport.executeKubernetesRequest(request)
-	default:
-		return transport.executeKubernetesRequest(request)
 	}
+
+	return transport.executeKubernetesRequest(request)
 }

api/http/proxy/factory/kubernetes/pods.go

@@ -5,11 +5,9 @@ import (
 )
 
 func (transport *baseTransport) proxyPodsRequest(request *http.Request, namespace, requestPath string) (*http.Response, error) {
-	switch request.Method {
+	if request.Method == http.MethodDelete {
-	case "DELETE":
 		transport.refreshRegistry(request, namespace)
-		return transport.executeKubernetesRequest(request)
-	default:
-		return transport.executeKubernetesRequest(request)
 	}
+
+	return transport.executeKubernetesRequest(request)
 }

api/internal/authorization/authorizations.go

@@ -508,18 +508,21 @@ func getUserEndpointAuthorizations(user *portainer.User, endpoints []portainer.E
 		authorizations := getAuthorizationsFromUserEndpointPolicy(user, &endpoint, roles)
 		if len(authorizations) > 0 {
 			endpointAuthorizations[endpoint.ID] = authorizations
+
 			continue
 		}
 
 		authorizations = getAuthorizationsFromUserEndpointGroupPolicy(user, &endpoint, roles, groupUserAccessPolicies)
 		if len(authorizations) > 0 {
 			endpointAuthorizations[endpoint.ID] = authorizations
+
 			continue
 		}
 
 		authorizations = getAuthorizationsFromTeamEndpointPolicies(userMemberships, &endpoint, roles)
 		if len(authorizations) > 0 {
 			endpointAuthorizations[endpoint.ID] = authorizations
+
 			continue
 		}
 
@@ -587,6 +590,7 @@ func getAuthorizationsFromRoles(roleIdentifiers []portainer.RoleID, roles []port
 		for _, role := range roles {
 			if role.ID == id {
 				associatedRoles = append(associatedRoles, role)
+
 				break
 			}
 		}
@@ -609,6 +613,7 @@ func (service *Service) UserIsAdminOrAuthorized(userID portainer.UserID, endpoin
 	if err != nil {
 		return false, err
 	}
+
 	if user.Role == portainer.AdministratorRole {
 		return true, nil
 	}
@@ -619,5 +624,6 @@ func (service *Service) UserIsAdminOrAuthorized(userID portainer.UserID, endpoin
 			return true, nil
 		}
 	}
+
 	return false, nil
 }

api/internal/authorization/endpoint_role_with_override.go

@@ -74,20 +74,11 @@ func (service *Service) getUserEndpointAccessWithPolicies(
 		}
 	}
 
-	if userAccess(tx, userID, endpoint.UserAccessPolicies, endpoint.TeamAccessPolicies, memberships) {
+	return userAccess(userID, endpoint.UserAccessPolicies, endpoint.TeamAccessPolicies, memberships) ||
-		return true, nil
+		userAccess(userID, endpointGroup.UserAccessPolicies, endpointGroup.TeamAccessPolicies, memberships), nil
-	}
-
-	if userAccess(tx, userID, endpointGroup.UserAccessPolicies, endpointGroup.TeamAccessPolicies, memberships) {
-		return true, nil
-	}
-
-	return false, nil
-
 }
 
 func userAccess(
-	tx dataservices.DataStoreTx,
 	userID portainer.UserID,
 	userAccessPolicies portainer.UserAccessPolicies,
 	teamAccessPolicies portainer.TeamAccessPolicies,

api/kubernetes/cli/client.go

@@ -7,10 +7,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/patrickmn/go-cache"
-	"github.com/pkg/errors"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
+
+	"github.com/patrickmn/go-cache"
+	"github.com/pkg/errors"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -116,7 +117,7 @@ func (factory *ClientFactory) SetProxyKubeClient(endpointID, token string, cli *
 // CreateKubeClientFromKubeConfig creates a KubeClient from a clusterID, and
 // Kubernetes config.
 func (factory *ClientFactory) CreateKubeClientFromKubeConfig(clusterID string, kubeConfig []byte) (*KubeClient, error) {
-	config, err := clientcmd.NewClientConfigFromBytes([]byte(kubeConfig))
+	config, err := clientcmd.NewClientConfigFromBytes(kubeConfig)
 	if err != nil {
 		return nil, err
 	}

api/kubernetes/cli/nodes_limits_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	portainer "github.com/portainer/portainer/api"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -76,8 +77,8 @@ func newPods() *v1.PodList {
 							Name: "test-container-1",
 							Resources: v1.ResourceRequirements{
 								Requests: v1.ResourceList{
-									v1.ResourceName(v1.ResourceCPU):    resource.MustParse("2"),
+									v1.ResourceCPU:    resource.MustParse("2"),
-									v1.ResourceName(v1.ResourceMemory): resource.MustParse("3M"),
+									v1.ResourceMemory: resource.MustParse("3M"),
 								},
 							},
 						},

api/kubernetes/cli/resource_test.go

@@ -85,7 +85,7 @@ func Test_GenerateYAML(t *testing.T) {
 				t.Errorf("generateYamlConfig failed; err=%s", err)
 			}
 
-			if compareYAMLStrings(string(yaml), ryt.wantYAML) != 0 {
+			if compareYAMLStrings(yaml, ryt.wantYAML) != 0 {
 				t.Errorf("generateYamlConfig failed;\ngot=\n%s\nwant=\n%s", yaml, ryt.wantYAML)
 			}
 		})

api/stacks/stackbuilders/stack_builder.go

@@ -5,6 +5,7 @@ import (
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
 	"github.com/portainer/portainer/api/stacks/deployments"
+
 	"github.com/rs/zerolog/log"
 )
 
@@ -41,6 +42,7 @@ func (b *StackBuilder) SaveStack() (*portainer.Stack, *httperror.HandlerError) {
 	}
 
 	b.doCleanUp = false
+
 	return b.stack, b.err
 }