Skip to content

Modern Docker Management, Designed for Everyone

chore: clean up redundant conversions, shadowed imports, and nil slices

Kyle Mendell5a612eba4156
diff --git a/backend/api/handlers/environments.go b/backend/api/handlers/environments.go
index f57c4a657..89b3e2b7b 100644
--- a/backend/api/handlers/environments.go
+++ b/backend/api/handlers/environments.go
@@ -1256,12 +1256,12 @@ func isSensitiveMTLSAssetNameInternal(fileName string) bool {
}
func environmentMTLSDownloadBaseNameInternal(env *models.Environment) string {
- base := strings.TrimSpace(env.Name)
- if base == "" {
- base = "environment"
+ baseName := strings.TrimSpace(env.Name)
+ if baseName == "" {
+ baseName = "environment"
}
- base = strings.Map(func(r rune) rune {
+ baseName = strings.Map(func(r rune) rune {
switch {
case r >= 'a' && r <= 'z':
return r
@@ -1272,24 +1272,24 @@ func environmentMTLSDownloadBaseNameInternal(env *models.Environment) string {
default:
return '-'
}
- }, base)
+ }, baseName)
- base = strings.Trim(base, "-")
- if base == "" {
- base = "environment"
+ baseName = strings.Trim(baseName, "-")
+ if baseName == "" {
+ baseName = "environment"
}
- return base + "-" + env.ID
+ return baseName + "-" + env.ID
}
func environmentMTLSAssetDownloadNameInternal(env *models.Environment, fileName string) string {
- base := environmentMTLSDownloadBaseNameInternal(env)
+ baseName := environmentMTLSDownloadBaseNameInternal(env)
switch fileName {
case "agent.crt":
- return base + ".pem"
+ return baseName + ".pem"
case "agent.key":
- return base + ".key"
+ return baseName + ".key"
default:
return fileName
}
diff --git a/backend/api/handlers/git_repositories_test.go b/backend/api/handlers/git_repositories_test.go
index f858eb9dc..ffcbfd967 100644
--- a/backend/api/handlers/git_repositories_test.go
+++ b/backend/api/handlers/git_repositories_test.go
@@ -127,4 +127,4 @@ func TestGitRepositoryHandlers_PermissionGating(t *testing.T) {
// Compile-time assertion that GitRepositoryService is the type the production
// handler expects; keeps this test honest if the field is ever renamed.
-var _ = (*GitRepositoryHandler)(&GitRepositoryHandler{repoService: &services.GitRepositoryService{}})
+var _ = &GitRepositoryHandler{repoService: &services.GitRepositoryService{}}
diff --git a/backend/api/handlers/image_updates.go b/backend/api/handlers/image_updates.go
index f0d81f31f..99f403bf2 100644
--- a/backend/api/handlers/image_updates.go
+++ b/backend/api/handlers/image_updates.go
@@ -205,7 +205,7 @@ func (h *ImageUpdateHandler) CheckMultipleImages(ctx context.Context, input *Che
return &CheckMultipleImagesOutput{
Body: base.ApiResponse[imageupdate.BatchResponse]{
Success: true,
- Data: imageupdate.BatchResponse(results),
+ Data: results,
},
}, nil
}
@@ -220,7 +220,7 @@ func (h *ImageUpdateHandler) CheckAllImages(ctx context.Context, input *CheckAll
return &CheckAllImagesOutput{
Body: base.ApiResponse[imageupdate.BatchResponse]{
Success: true,
- Data: imageupdate.BatchResponse(results),
+ Data: results,
},
}, nil
}
diff --git a/backend/api/handlers/notifications_test.go b/backend/api/handlers/notifications_test.go
index d8e90e555..dca1c427a 100644
--- a/backend/api/handlers/notifications_test.go
+++ b/backend/api/handlers/notifications_test.go
@@ -133,7 +133,7 @@ func TestDispatchNotification_ReturnsBadRequestForUnsupportedDispatchKind(t *tes
resp, err := h.DispatchNotification(ctx, &DispatchNotificationInput{
APIKey: token,
Body: notificationdto.DispatchRequest{
- Kind: notificationdto.DispatchKind("bogus_kind"),
+ Kind: "bogus_kind",
},
})
require.Nil(t, resp)
diff --git a/backend/api/handlers/oidc.go b/backend/api/handlers/oidc.go
index dfd1eff8e..780ac4aab 100644
--- a/backend/api/handlers/oidc.go
+++ b/backend/api/handlers/oidc.go
@@ -263,7 +263,7 @@ func (h *OidcHandler) GetOidcStatus(ctx context.Context, _ *GetOidcStatusInput)
// GetOidcConfig returns the OIDC client configuration.
func (h *OidcHandler) GetOidcConfig(ctx context.Context, input *GetOidcConfigInput) (*GetOidcConfigOutput, error) {
- config, err := h.authService.GetOidcConfig(ctx)
+ oidcConfig, err := h.authService.GetOidcConfig(ctx)
if err != nil {
return nil, huma.Error500InternalServerError("Failed to get OIDC configuration")
}
@@ -276,14 +276,14 @@ func (h *OidcHandler) GetOidcConfig(ctx context.Context, input *GetOidcConfigInp
return &GetOidcConfigOutput{
Body: auth.OidcConfigResponse{
- ClientID: config.ClientID,
+ ClientID: oidcConfig.ClientID,
RedirectUri: h.oidcService.GetOidcRedirectURL(origin),
- IssuerUrl: config.IssuerURL,
- AuthorizationEndpoint: config.AuthorizationEndpoint,
- TokenEndpoint: config.TokenEndpoint,
- UserinfoEndpoint: config.UserinfoEndpoint,
- DeviceAuthorizationEndpoint: config.DeviceAuthorizationEndpoint,
- Scopes: config.Scopes,
+ IssuerUrl: oidcConfig.IssuerURL,
+ AuthorizationEndpoint: oidcConfig.AuthorizationEndpoint,
+ TokenEndpoint: oidcConfig.TokenEndpoint,
+ UserinfoEndpoint: oidcConfig.UserinfoEndpoint,
+ DeviceAuthorizationEndpoint: oidcConfig.DeviceAuthorizationEndpoint,
+ Scopes: oidcConfig.Scopes,
},
}, nil
}
diff --git a/backend/api/handlers/projects.go b/backend/api/handlers/projects.go
index 460f15a10..6d532c4c1 100644
--- a/backend/api/handlers/projects.go
+++ b/backend/api/handlers/projects.go
@@ -982,12 +982,12 @@ func (h *ProjectHandler) RestartProject(ctx context.Context, input *RestartProje
// UpdateProjectServices pulls the latest images for the given services and recreates them.
func (h *ProjectHandler) UpdateProjectServices(ctx context.Context, input *UpdateProjectServicesInput) (*UpdateProjectServicesOutput, error) {
- var services []string
+ var serviceNames []string
if input.Body != nil {
- services = input.Body.Services
+ serviceNames = input.Body.Services
}
- response, err := h.runProjectActivityActionResponseInternal(ctx, input.EnvironmentID, input.ProjectID, h.updateProjectServicesActivityConfigInternal(services))
+ response, err := h.runProjectActivityActionResponseInternal(ctx, input.EnvironmentID, input.ProjectID, h.updateProjectServicesActivityConfigInternal(serviceNames))
if err != nil {
return nil, err
}
diff --git a/backend/api/handlers/remenv_handlers_test.go b/backend/api/handlers/remenv_handlers_test.go
index 4fa4db2c9..a218db91c 100644
--- a/backend/api/handlers/remenv_handlers_test.go
+++ b/backend/api/handlers/remenv_handlers_test.go
@@ -37,7 +37,7 @@ func setupRemoteHandlerEnvironmentServiceInternal(t *testing.T, server *httptest
require.NoError(t, db.AutoMigrate(&models.Environment{}))
now := time.Now()
- env := &models.Environment{
+ envRecord := &models.Environment{
BaseModel: models.BaseModel{
ID: "env-remote",
CreatedAt: now,
@@ -49,7 +49,7 @@ func setupRemoteHandlerEnvironmentServiceInternal(t *testing.T, server *httptest
Enabled: true,
IsEdge: false,
}
- require.NoError(t, db.WithContext(context.Background()).Create(env).Error)
+ require.NoError(t, db.WithContext(context.Background()).Create(envRecord).Error)
return services.NewEnvironmentService(&database.DB{DB: db}, server.Client(), nil, nil, nil, nil)
}
diff --git a/backend/api/middleware/role.go b/backend/api/middleware/role.go
index 603fa7ff1..d0d1b5c0e 100644
--- a/backend/api/middleware/role.go
+++ b/backend/api/middleware/role.go
@@ -10,11 +10,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
-// MetaRequiredPermission is re-exported from the authz package for callers that
-// reference it via this middleware package. The authoritative definition (and
-// the matcher that consumes it) lives in authz.
-const MetaRequiredPermission = authz.MetaRequiredPermission
-
// RegisterWithPermission registers a Huma operation that requires perm. It
// attaches the RequirePermission middleware AND records perm in the operation
// metadata (authz.MetaRequiredPermission) so the remote environment proxy can
diff --git a/backend/internal/services/build_service.go b/backend/internal/services/build_service.go
index ead94670c..81c6b7bd5 100644
--- a/backend/internal/services/build_service.go
+++ b/backend/internal/services/build_service.go
@@ -549,21 +549,21 @@ func buildToRecord(build models.ImageBuild, includeOutput bool) imagetypes.Build
ContextDir: build.ContextDir,
Dockerfile: build.Dockerfile,
Target: build.Target,
- Tags: []string(build.Tags),
- Platforms: []string(build.Platforms),
+ Tags: build.Tags,
+ Platforms: build.Platforms,
BuildArgs: buildArgs,
Labels: labels,
- CacheFrom: []string(build.CacheFrom),
- CacheTo: []string(build.CacheTo),
+ CacheFrom: build.CacheFrom,
+ CacheTo: build.CacheTo,
NoCache: build.NoCache,
Pull: build.Pull,
Network: build.BuildNetwork,
Isolation: build.Isolation,
ShmSize: build.ShmSize,
Ulimits: ulimits,
- Entitlements: []string(build.Entitlements),
+ Entitlements: build.Entitlements,
Privileged: build.Privileged,
- ExtraHosts: []string(build.ExtraHosts),
+ ExtraHosts: build.ExtraHosts,
Push: build.Push,
Load: build.Load,
Digest: build.Digest,
diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.go
index c014bc9f6..048c785ad 100644
--- a/backend/internal/services/container_registry_service.go
+++ b/backend/internal/services/container_registry_service.go
@@ -141,11 +141,11 @@ func (s *ContainerRegistryService) GetRegistriesPaginated(ctx context.Context, p
}
func (s *ContainerRegistryService) GetRegistryByID(ctx context.Context, id string) (*models.ContainerRegistry, error) {
- var registry models.ContainerRegistry
- if err := s.db.WithContext(ctx).Where("id = ?", id).First(&registry).Error; err != nil {
+ var registryRecord models.ContainerRegistry
+ if err := s.db.WithContext(ctx).Where("id = ?", id).First(&registryRecord).Error; err != nil {
return nil, errors.WrapIf(err, "failed to get container registry")
}
- return &registry, nil
+ return &registryRecord, nil
}
func (s *ContainerRegistryService) CreateRegistry(ctx context.Context, req models.CreateContainerRegistryRequest) (*models.ContainerRegistry, error) {
@@ -154,7 +154,7 @@ func (s *ContainerRegistryService) CreateRegistry(ctx context.Context, req model
return nil, err
}
- registry := &models.ContainerRegistry{
+ registryRecord := &models.ContainerRegistry{
URL: req.URL,
Description: req.Description,
Insecure: req.Insecure != nil && *req.Insecure,
@@ -178,9 +178,9 @@ func (s *ContainerRegistryService) CreateRegistry(ctx context.Context, req model
if err != nil {
return nil, errors.WrapIf(err, "failed to encrypt AWS secret access key")
}
- registry.AWSAccessKeyID = req.AWSAccessKeyID
- registry.AWSSecretAccessKey = encryptedSecret
- registry.AWSRegion = req.AWSRegion
+ registryRecord.AWSAccessKeyID = req.AWSAccessKeyID
+ registryRecord.AWSSecretAccessKey = encryptedSecret
+ registryRecord.AWSRegion = req.AWSRegion
} else {
if strings.TrimSpace(req.Username) == "" {
return nil, common.Classify(common.ErrValidation, errors.WithDetails(errors.New("Username is required"), "field", "username"))
@@ -192,33 +192,33 @@ func (s *ContainerRegistryService) CreateRegistry(ctx context.Context, req model
if err != nil {
return nil, errors.WrapIf(err, "failed to encrypt token")
}
- registry.Username = req.Username
- registry.Token = encryptedToken
+ registryRecord.Username = req.Username
+ registryRecord.Token = encryptedToken
}
- if err := s.db.WithContext(ctx).Create(registry).Error; err != nil {
+ if err := s.db.WithContext(ctx).Create(registryRecord).Error; err != nil {
return nil, errors.WrapIf(err, "failed to create registry")
}
- return registry, nil
+ return registryRecord, nil
}
func (s *ContainerRegistryService) UpdateRegistry(ctx context.Context, id string, req models.UpdateContainerRegistryRequest) (*models.ContainerRegistry, error) {
- registry, err := s.GetRegistryByID(ctx, id)
+ registryRecord, err := s.GetRegistryByID(ctx, id)
if err != nil {
return nil, err
}
- if err := s.applyRegistryTypeUpdateInternal(registry, req.RegistryType); err != nil {
+ if err := s.applyRegistryTypeUpdateInternal(registryRecord, req.RegistryType); err != nil {
return nil, err
}
- storedCredentials := map[string]bool{"token": registry.Token != ""}
+ storedCredentials := map[string]bool{"token": registryRecord.Token != ""}
updatedCredentials := map[string]bool{"token": req.Token != nil && *req.Token != ""}
- if registry.RegistryType == registryTypeECR {
+ if registryRecord.RegistryType == registryTypeECR {
storedCredentials = map[string]bool{
- "awsAccessKeyId": registry.AWSAccessKeyID != "",
- "awsSecretAccessKey": registry.AWSSecretAccessKey != "",
+ "awsAccessKeyId": registryRecord.AWSAccessKeyID != "",
+ "awsSecretAccessKey": registryRecord.AWSSecretAccessKey != "",
}
updatedCredentials = map[string]bool{
"awsAccessKeyId": req.AWSAccessKeyID != nil && *req.AWSAccessKeyID != "",
@@ -227,7 +227,7 @@ func (s *ContainerRegistryService) UpdateRegistry(ctx context.Context, id string
}
if err := validation.ValidateCredentialTargetChange(
"registry URL",
- registry.URL,
+ registryRecord.URL,
req.URL,
normalizeRegistryServerAddressInternal,
storedCredentials,
@@ -237,26 +237,26 @@ func (s *ContainerRegistryService) UpdateRegistry(ctx context.Context, id string
}
// Update common fields
- utils.ApplyChanged(&registry.URL, mo.PointerToOption(req.URL))
- utils.ApplyNullable(&registry.Description, mo.PointerToOption(req.Description))
- utils.ApplyChanged(&registry.Insecure, mo.PointerToOption(req.Insecure))
- utils.ApplyChanged(&registry.Enabled, mo.PointerToOption(req.Enabled))
+ utils.ApplyChanged(&registryRecord.URL, mo.PointerToOption(req.URL))
+ utils.ApplyNullable(&registryRecord.Description, mo.PointerToOption(req.Description))
+ utils.ApplyChanged(&registryRecord.Insecure, mo.PointerToOption(req.Insecure))
+ utils.ApplyChanged(&registryRecord.Enabled, mo.PointerToOption(req.Enabled))
- if registry.RegistryType == registryTypeECR {
- if err := s.updateECRRegistryFieldsInternal(registry, req); err != nil {
+ if registryRecord.RegistryType == registryTypeECR {
+ if err := s.updateECRRegistryFieldsInternal(registryRecord, req); err != nil {
return nil, err
}
- } else if err := s.updateGenericRegistryFieldsInternal(registry, req); err != nil {
+ } else if err := s.updateGenericRegistryFieldsInternal(registryRecord, req); err != nil {
return nil, err
}
- registry.UpdatedAt = time.Now()
+ registryRecord.UpdatedAt = time.Now()
- if err := s.db.WithContext(ctx).Save(registry).Error; err != nil {
+ if err := s.db.WithContext(ctx).Save(registryRecord).Error; err != nil {
return nil, errors.WrapIf(err, "failed to update registry")
}
- return registry, nil
+ return registryRecord, nil
}
func (s *ContainerRegistryService) applyRegistryTypeUpdateInternal(registry *models.ContainerRegistry, registryType *string) error {
@@ -333,12 +333,12 @@ func (s *ContainerRegistryService) DeleteRegistry(ctx context.Context, id string
// GetDecryptedToken returns the decrypted token for a registry
func (s *ContainerRegistryService) GetDecryptedToken(ctx context.Context, id string) (string, error) {
- registry, err := s.GetRegistryByID(ctx, id)
+ registryRecord, err := s.GetRegistryByID(ctx, id)
if err != nil {
return "", err
}
- decryptedToken, err := crypto.Decrypt(registry.Token)
+ decryptedToken, err := crypto.Decrypt(registryRecord.Token)
if err != nil {
return "", errors.WrapIf(err, "failed to decrypt token")
}
@@ -781,7 +781,7 @@ func (s *ContainerRegistryService) ImageDigest(ctx context.Context, imageRef str
return "", err
}
- digest, found, err := s.cache.GetWithLoaders(normalizedRef, func(_ []string) (map[string]string, error) {
+ digestValue, found, err := s.cache.GetWithLoaders(normalizedRef, func(_ []string) (map[string]string, error) {
loadCtx, cancel := context.WithTimeout(ctx, timeouts.DefaultRegistry)
defer cancel()
@@ -797,7 +797,7 @@ func (s *ContainerRegistryService) ImageDigest(ctx context.Context, imageRef str
if !found {
return "", errors.New("registry digest cache loader returned no digest")
}
- return digest, nil
+ return digestValue, nil
}
func (s *ContainerRegistryService) inspectImageDigestInternal(ctx context.Context, imageRef string, externalCreds []containerregistry.Credential) (*registryDigestResult, error) {
@@ -890,12 +890,12 @@ func (s *ContainerRegistryService) inspectImageDigestViaDaemonInternal(ctx conte
inspectResult, err := dockerClient.DistributionInspect(ctx, normalizedRef, client.DistributionInspectOptions{})
if err == nil {
- digest, normalizeErr := digest.Normalize(inspectResult.Descriptor.Digest.String())
+ digestValue, normalizeErr := digest.Normalize(inspectResult.Descriptor.Digest.String())
if normalizeErr != nil {
return nil, errors.WrapIff(normalizeErr, "distribution inspect returned invalid digest for %s", normalizedRef)
}
return &registryDigestResult{
- Digest: digest,
+ Digest: digestValue,
AuthMethod: "anonymous",
AuthRegistry: registryHost,
}, nil
@@ -928,12 +928,12 @@ func (s *ContainerRegistryService) inspectImageDigestWithCredentialsInternal(ctx
EncodedRegistryAuth: authHeader,
})
if err == nil {
- digest, normalizeErr := digest.Normalize(inspectResult.Descriptor.Digest.String())
+ digestValue, normalizeErr := digest.Normalize(inspectResult.Descriptor.Digest.String())
if normalizeErr != nil {
return nil, errors.WrapIff(normalizeErr, "distribution inspect returned invalid digest for %s", normalizedRef)
}
return &registryDigestResult{
- Digest: digest,
+ Digest: digestValue,
AuthMethod: "credential",
AuthUsername: credential.Username,
AuthRegistry: registryHost,
@@ -964,10 +964,10 @@ func (s *ContainerRegistryService) inspectImageDigestWithCredentialsInternal(ctx
}
func (s *ContainerRegistryService) inspectImageDigestViaRegistryInternal(ctx context.Context, registryHost, repository, tag string, externalCreds []containerregistry.Credential) (*registryDigestResult, error) {
- digest, err := s.fetchDigestFromRegistryInternal(ctx, registryHost, repository, tag, nil)
+ digestValue, err := s.fetchDigestFromRegistryInternal(ctx, registryHost, repository, tag, nil)
if err == nil {
return &registryDigestResult{
- Digest: digest,
+ Digest: digestValue,
AuthMethod: "anonymous",
AuthRegistry: registryHost,
}, nil
@@ -988,10 +988,10 @@ func (s *ContainerRegistryService) inspectImageDigestViaRegistryInternal(ctx con
for _, credential := range credentials {
lastCred = credential
- digest, err = s.fetchDigestFromRegistryInternal(ctx, registryHost, repository, tag, &credential)
+ digestValue, err = s.fetchDigestFromRegistryInternal(ctx, registryHost, repository, tag, &credential)
if err == nil {
return &registryDigestResult{
- Digest: digest,
+ Digest: digestValue,
AuthMethod: "credential",
AuthUsername: credential.Username,
AuthRegistry: registryHost,
diff --git a/backend/internal/services/container_registry_service_test.go b/backend/internal/services/container_registry_service_test.go
index 8d90f6f69..d53515f9c 100644
--- a/backend/internal/services/container_registry_service_test.go
+++ b/backend/internal/services/container_registry_service_test.go
@@ -75,9 +75,9 @@ func newDockerHubRateLimitTestClient(t *testing.T, handler http.HandlerFunc) *ht
targetURL, err := url.Parse(server.URL)
require.NoError(t, err)
- client := server.Client()
- baseTransport := client.Transport
- client.Transport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
+ httpClient := server.Client()
+ baseTransport := httpClient.Transport
+ httpClient.Transport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
if req.URL.Host == "registry-1.docker.io" || req.URL.Host == "auth.docker.io" {
rewritten := req.Clone(req.Context())
rewritten.URL.Scheme = targetURL.Scheme
@@ -88,7 +88,7 @@ func newDockerHubRateLimitTestClient(t *testing.T, handler http.HandlerFunc) *ht
return baseTransport.RoundTrip(req)
})
- return client
+ return httpClient
}
func TestNewContainerRegistryService_InitializesDistributionHTTPClient(t *testing.T) {
diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.go
index 90411a515..97a72d6e2 100644
--- a/backend/internal/services/container_service.go
+++ b/backend/internal/services/container_service.go
@@ -453,9 +453,9 @@ func (s *ContainerService) tryRedeployViaComposeProjectInternal(ctx context.Cont
if s.projectService == nil || containerInfo.Config == nil {
return "", false, nil
}
- labels := containerInfo.Config.Labels
- projectName := dockerutils.ComposeProjectLabel(labels)
- serviceName := dockerutils.ComposeServiceLabel(labels)
+ containerLabels := containerInfo.Config.Labels
+ projectName := dockerutils.ComposeProjectLabel(containerLabels)
+ serviceName := dockerutils.ComposeServiceLabel(containerLabels)
if projectName == "" || serviceName == "" {
return "", false, nil
}
diff --git a/backend/internal/services/customize_search_service.go b/backend/internal/services/customize_search_service.go
index 298d6e355..ccd108f9d 100644
--- a/backend/internal/services/customize_search_service.go
+++ b/backend/internal/services/customize_search_service.go
@@ -42,7 +42,7 @@ func (s *CustomizeSearchService) buildCategoriesFromModel() []category.Category
// map category id -> list of customizations
categories := map[string][]meta.Metadata{}
- categoryOrder := []string{} // Track order from first appearance in struct
+ var categoryOrder []string // Track order from first appearance in struct
rt := reflect.TypeFor[models.CustomizeItem]()
for field := range rt.Fields() {
diff --git a/backend/internal/services/environment_service.go b/backend/internal/services/environment_service.go
index 32b09c40c..9481d13b2 100644
--- a/backend/internal/services/environment_service.go
+++ b/backend/internal/services/environment_service.go
@@ -413,12 +413,12 @@ func (s *EnvironmentService) GetActiveRemoteEnvironmentSnapshot(environmentID st
}
s.remoteEnvMu.RLock()
- environment, ok := s.remoteEnvs[environmentID]
+ envRecord, ok := s.remoteEnvs[environmentID]
s.remoteEnvMu.RUnlock()
- if !ok || !isActiveRemoteEnvironmentInternal(environment) {
+ if !ok || !isActiveRemoteEnvironmentInternal(envRecord) {
return mo.None[models.Environment]()
}
- return mo.Some(environment)
+ return mo.Some(envRecord)
}
func isActiveRemoteEnvironmentInternal(environment models.Environment) bool {
@@ -431,9 +431,9 @@ func (s *EnvironmentService) syncRemoteEnvironmentSnapshotsInternal(environments
}
next := make(map[string]models.Environment, len(environments))
- for _, environment := range environments {
- if isActiveRemoteEnvironmentInternal(environment) {
- next[environment.ID] = environment
+ for _, envRecord := range environments {
+ if isActiveRemoteEnvironmentInternal(envRecord) {
+ next[envRecord.ID] = envRecord
}
}
@@ -475,13 +475,13 @@ func (s *EnvironmentService) updateRemoteEnvironmentSnapshotInternal(environment
s.remoteEnvMu.Lock()
defer s.remoteEnvMu.Unlock()
- environment, ok := s.remoteEnvs[environmentID]
+ envRecord, ok := s.remoteEnvs[environmentID]
if !ok {
return
}
- update(&environment)
- if isActiveRemoteEnvironmentInternal(environment) {
- s.remoteEnvs[environmentID] = environment
+ update(&envRecord)
+ if isActiveRemoteEnvironmentInternal(envRecord) {
+ s.remoteEnvs[environmentID] = envRecord
} else {
delete(s.remoteEnvs, environmentID)
}
@@ -629,20 +629,20 @@ func (s *EnvironmentService) BindSwarmNodeEnvironment(
parentEnvironmentID, nodeID, environmentID string,
rebind bool,
) (*models.Environment, error) {
- var environment models.Environment
+ var envRecord models.Environment
err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
- if err := tx.Where("id = ?", environmentID).First(&environment).Error; err != nil {
+ if err := tx.Where("id = ?", environmentID).First(&envRecord).Error; err != nil {
return errors.WrapIf(err, "failed to load environment for swarm node binding")
}
- if environment.Hidden {
+ if envRecord.Hidden {
return errors.New("dedicated agent environments cannot be attached as visible environments")
}
- if !environment.Enabled {
+ if !envRecord.Enabled {
return errors.New("disabled environments cannot be attached to swarm nodes")
}
- boundElsewhere := environment.ParentEnvironmentID != nil && environment.SwarmNodeID != nil &&
- (strings.TrimSpace(*environment.ParentEnvironmentID) != parentEnvironmentID || strings.TrimSpace(*environment.SwarmNodeID) != nodeID)
+ boundElsewhere := envRecord.ParentEnvironmentID != nil && envRecord.SwarmNodeID != nil &&
+ (strings.TrimSpace(*envRecord.ParentEnvironmentID) != parentEnvironmentID || strings.TrimSpace(*envRecord.SwarmNodeID) != nodeID)
if boundElsewhere && !rebind {
return errors.New("environment is already bound to another swarm node; explicit rebinding is required")
}
@@ -672,14 +672,14 @@ func (s *EnvironmentService) BindSwarmNodeEnvironment(
return errors.WrapIf(err, "failed to bind environment to swarm node")
}
- return tx.Where("id = ?", environmentID).First(&environment).Error
+ return tx.Where("id = ?", environmentID).First(&envRecord).Error
})
if err != nil {
return nil, err
}
- s.cacheRemoteEnvironmentSnapshotInternal(environment)
- return &environment, nil
+ s.cacheRemoteEnvironmentSnapshotInternal(envRecord)
+ return &envRecord, nil
}
// DetachSwarmNodeEnvironment clears a visible environment binding from a node.
@@ -697,17 +697,17 @@ func (s *EnvironmentService) DetachSwarmNodeEnvironment(ctx context.Context, par
// DeleteSwarmNodeAgentDeployment removes a dedicated hidden agent registration
// while leaving visible remote environments untouched.
func (s *EnvironmentService) DeleteSwarmNodeAgentDeployment(ctx context.Context, parentEnvironmentID, nodeID string, userID, username *string) error {
- var environment models.Environment
+ var envRecord models.Environment
if err := s.db.WithContext(ctx).
Where("hidden = ? AND parent_environment_id = ? AND swarm_node_id = ?", true, parentEnvironmentID, nodeID).
- First(&environment).Error; err != nil {
+ First(&envRecord).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil
}
return errors.WrapIf(err, "failed to load swarm node agent deployment")
}
- return s.DeleteEnvironment(ctx, environment.ID, userID, username)
+ return s.DeleteEnvironment(ctx, envRecord.ID, userID, username)
}
func buildSwarmNodeAgentNameInternal(hostname, nodeID string) string {
@@ -829,14 +829,14 @@ func (s *EnvironmentService) UpdateSwarmNodeIdentity(ctx context.Context, envID,
}
func (s *EnvironmentService) GetEnvironmentByID(ctx context.Context, id string) (*models.Environment, error) {
- var environment models.Environment
- if err := s.db.WithContext(ctx).Where("id = ?", id).First(&environment).Error; err != nil {
+ var envRecord models.Environment
+ if err := s.db.WithContext(ctx).Where("id = ?", id).First(&envRecord).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, errors.New("environment not found")
}
return nil, errors.WrapIf(err, "failed to get environment")
}
- return &environment, nil
+ return &envRecord, nil
}
func (s *EnvironmentService) ListEnvironmentsPaginated(ctx context.Context, params pagination.QueryParams, accessibleEnvIDs []string) ([]environment.Environment, pagination.Response, error) {
@@ -1236,7 +1236,7 @@ func (s *EnvironmentService) DeleteEnvironment(ctx context.Context, id string, u
}
func (s *EnvironmentService) TestConnection(ctx context.Context, id string, customApiUrl *string) (string, error) {
- environment, err := s.GetEnvironmentByID(ctx, id)
+ envRecord, err := s.GetEnvironmentByID(ctx, id)
if err != nil {
return "error", err
}
@@ -1254,11 +1254,11 @@ func (s *EnvironmentService) TestConnection(ctx context.Context, id string, cust
}
// For edge environments, check if there's an active tunnel and route through it
- if environment.IsEdge && customApiUrl == nil {
+ if envRecord.IsEdge && customApiUrl == nil {
return s.testEdgeConnection(ctx, id)
}
- apiUrl := environment.ApiUrl
+ apiUrl := envRecord.ApiUrl
if customApiUrl != nil {
apiUrl = *customApiUrl
}
@@ -1795,12 +1795,12 @@ type remoteEnvironmentTargetInternal struct {
}
func (s *EnvironmentService) resolveRemoteEnvironmentTargetInternal(ctx context.Context, envID string) (*remoteEnvironmentTargetInternal, error) {
- environment, err := s.GetEnvironmentByID(ctx, envID)
+ envRecord, err := s.GetEnvironmentByID(ctx, envID)
if err != nil {
return nil, errors.WrapIf(err, "failed to get environment")
}
- return s.remoteEnvironmentTargetFromModelInternal(*environment)
+ return s.remoteEnvironmentTargetFromModelInternal(*envRecord)
}
func (s *EnvironmentService) remoteEnvironmentTargetFromModelInternal(environment models.Environment) (*remoteEnvironmentTargetInternal, error) {
diff --git a/backend/internal/services/event_service.go b/backend/internal/services/event_service.go
index 2b2cc9431..3b6312e2a 100644
--- a/backend/internal/services/event_service.go
+++ b/backend/internal/services/event_service.go
@@ -69,7 +69,7 @@ func (s *EventService) CreateEvent(ctx context.Context, req CreateEventRequest)
}
userID, username := normalizeEventActor(req.UserID, req.Username)
- event := &models.Event{
+ eventRecord := &models.Event{
Type: req.Type,
Severity: severity,
Title: req.Title,
@@ -88,7 +88,7 @@ func (s *EventService) CreateEvent(ctx context.Context, req CreateEventRequest)
}
err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
- if err := tx.Create(event).Error; err != nil {
+ if err := tx.Create(eventRecord).Error; err != nil {
return errors.WrapIf(err, "failed to create event")
}
return nil
@@ -97,9 +97,9 @@ func (s *EventService) CreateEvent(ctx context.Context, req CreateEventRequest)
return nil, err
}
- s.forwardEventToManager(ctx, event)
+ s.forwardEventToManager(ctx, eventRecord)
- return event, nil
+ return eventRecord, nil
}
func (s *EventService) forwardEventToManager(ctx context.Context, eventModel *models.Event) {
@@ -623,7 +623,7 @@ func cloneEventMetadataValueInternal(value any) any {
case models.JSON:
return cloneEventMetadataInternal(typed)
case map[string]any:
- return cloneEventMetadataInternal(models.JSON(typed))
+ return cloneEventMetadataInternal(typed)
case []any:
out := make([]any, len(typed))
for i := range typed {
diff --git a/backend/internal/services/event_service_test.go b/backend/internal/services/event_service_test.go
index 279422936..8ba2e47ab 100644
--- a/backend/internal/services/event_service_test.go
+++ b/backend/internal/services/event_service_test.go
@@ -326,7 +326,7 @@ func TestEventService_ListEventsPaginated_TypeCategoryFilter(t *testing.T) {
require.NoError(t, err)
types := make([]string, 0, len(events))
for _, e := range events {
- types = append(types, string(e.Type))
+ types = append(types, e.Type)
}
return types
}
diff --git a/backend/internal/services/federated_credential_service.go b/backend/internal/services/federated_credential_service.go
index dbc2f3cf0..8f41aa1c4 100644
--- a/backend/internal/services/federated_credential_service.go
+++ b/backend/internal/services/federated_credential_service.go
@@ -179,7 +179,7 @@ func (s *FederatedCredentialService) Create(ctx context.Context, callerUserID st
Description: normalized.Description,
Enabled: normalized.Enabled,
IssuerURL: normalized.IssuerURL,
- Audiences: models.StringSlice(normalized.Audiences),
+ Audiences: normalized.Audiences,
SubjectClaim: normalized.SubjectClaim,
SubjectMatch: normalized.SubjectMatch,
MatchType: normalized.MatchType,
@@ -482,7 +482,7 @@ func (s *FederatedCredentialService) providerForIssuerInternal(ctx context.Conte
func selectMatchingCredentialInternal(credentials []models.FederatedCredential, tokenAudiences []string, claims map[string]any) *models.FederatedCredential {
for i := range credentials {
credential := &credentials[i]
- if !audienceMatchesInternal(tokenAudiences, []string(credential.Audiences)) {
+ if !audienceMatchesInternal(tokenAudiences, credential.Audiences) {
continue
}
subjectClaim := strings.TrimSpace(credential.SubjectClaim)
@@ -637,7 +637,7 @@ func applyFederatedCredentialUpdateInternal(existing models.FederatedCredential,
if len(audiences) == 0 {
return existing, false, common.Classify(common.ErrFederatedCredentialInvalid, errors.New("invalid federated credential"))
}
- existing.Audiences = models.StringSlice(audiences)
+ existing.Audiences = audiences
}
if req.SubjectClaim != nil {
subjectClaim := strings.TrimSpace(*req.SubjectClaim)
diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.go
index 46864d95c..872fc1acf 100644
--- a/backend/internal/services/gitops_sync_service.go
+++ b/backend/internal/services/gitops_sync_service.go
@@ -415,7 +415,7 @@ func (s *GitOpsSyncService) buildSyncJobInternal(syncID, environmentID string, i
// (e.g. deleted out-of-band via raw SQL), the job unregisters itself instead of
// firing forever; transient load errors are skipped and retried next tick.
func (s *GitOpsSyncService) runScheduledSyncInternal(ctx context.Context, environmentID, syncID string) {
- sync, err := s.getSyncRecordByIDInternal(ctx, environmentID, syncID)
+ syncRecord, err := s.getSyncRecordByIDInternal(ctx, environmentID, syncID)
if err != nil {
if errors.Is(err, common.ErrNotFound) {
slog.InfoContext(ctx, "gitops auto-sync job unregistering; sync no longer exists", "syncId", syncID)
@@ -425,7 +425,7 @@ func (s *GitOpsSyncService) runScheduledSyncInternal(ctx context.Context, enviro
slog.DebugContext(ctx, "gitops auto-sync skipped; failed to load sync", "syncId", syncID, "error", err)
return
}
- if !sync.AutoSync {
+ if !syncRecord.AutoSync {
return
}
if _, err := s.PerformSync(ctx, environmentID, syncID, systemUser); err != nil {
@@ -478,10 +478,10 @@ func (s *GitOpsSyncService) RegisterAutoSyncJobsOnStartup(ctx context.Context) {
return
}
for i := range syncs {
- sync := syncs[i]
- s.registerSyncJobInternal(ctx, sync.ID, sync.EnvironmentID, sync.SyncInterval)
- if isGitOpsSyncOverdueInternal(&sync) {
- s.kickSyncInternal(ctx, sync.ID, sync.EnvironmentID)
+ syncRecord := syncs[i]
+ s.registerSyncJobInternal(ctx, syncRecord.ID, syncRecord.EnvironmentID, syncRecord.SyncInterval)
+ if isGitOpsSyncOverdueInternal(&syncRecord) {
+ s.kickSyncInternal(ctx, syncRecord.ID, syncRecord.EnvironmentID)
}
}
slog.InfoContext(ctx, "Registered gitops auto-sync jobs on startup", "count", len(syncs))
@@ -604,7 +604,7 @@ func (s *GitOpsSyncService) getFilteredSyncCounts(query *gorm.DB) (gitops.SyncCo
}
func (s *GitOpsSyncService) GetSyncByID(ctx context.Context, environmentID, id string) (*models.GitOpsSync, error) {
- sync, err := s.getSyncByIDInternal(ctx, environmentID, id, true)
+ syncRecord, err := s.getSyncByIDInternal(ctx, environmentID, id, true)
if err != nil {
if errors.Is(err, common.ErrNotFound) {
slog.WarnContext(ctx, "GitOps sync not found", "syncID", id, "environmentID", environmentID)
@@ -613,11 +613,11 @@ func (s *GitOpsSyncService) GetSyncByID(ctx context.Context, environmentID, id s
slog.ErrorContext(ctx, "Failed to get GitOps sync", "syncID", id, "environmentID", environmentID, "error", err)
return nil, err
}
- return sync, nil
+ return syncRecord, nil
}
func (s *GitOpsSyncService) getSyncByIDInternal(ctx context.Context, environmentID, id string, preloadAssociations bool) (*models.GitOpsSync, error) {
- var sync models.GitOpsSync
+ var syncRecord models.GitOpsSync
q := s.db.WithContext(ctx).Where("id = ?", id)
if preloadAssociations {
q = q.Preload("Repository").Preload("Project")
@@ -625,13 +625,13 @@ func (s *GitOpsSyncService) getSyncByIDInternal(ctx context.Context, environment
if environmentID != "" {
q = q.Where("environment_id = ?", environmentID)
}
- if err := q.First(&sync).Error; err != nil {
+ if err := q.First(&syncRecord).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, common.Classify(common.ErrNotFound, errors.New("GitOps sync not found"))
}
return nil, errors.WrapIf(err, "failed to get sync")
}
- return &sync, nil
+ return &syncRecord, nil
}
func (s *GitOpsSyncService) getSyncRecordByIDInternal(ctx context.Context, environmentID, id string) (*models.GitOpsSync, error) {
@@ -657,7 +657,7 @@ func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string
defaultMaxFiles, defaultMaxTotalSize, defaultMaxBinarySize := s.getEnvironmentSyncLimits(ctx)
- sync := models.GitOpsSync{
+ syncRecord := models.GitOpsSync{
Name: req.Name,
EnvironmentID: environmentID,
RepositoryID: req.RepositoryID,
@@ -675,25 +675,25 @@ func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string
}
if req.AutoSync != nil {
- sync.AutoSync = *req.AutoSync
+ syncRecord.AutoSync = *req.AutoSync
}
if req.SyncInterval != nil {
- sync.SyncInterval = *req.SyncInterval
+ syncRecord.SyncInterval = *req.SyncInterval
}
if req.SyncDirectory != nil {
- sync.SyncDirectory = *req.SyncDirectory
+ syncRecord.SyncDirectory = *req.SyncDirectory
}
if err := validateSyncLimits(req.MaxSyncFiles, req.MaxSyncTotalSize, req.MaxSyncBinarySize); err != nil {
return nil, err
}
if req.MaxSyncFiles != nil {
- sync.MaxSyncFiles = *req.MaxSyncFiles
+ syncRecord.MaxSyncFiles = *req.MaxSyncFiles
}
if req.MaxSyncTotalSize != nil {
- sync.MaxSyncTotalSize = *req.MaxSyncTotalSize
+ syncRecord.MaxSyncTotalSize = *req.MaxSyncTotalSize
}
if req.MaxSyncBinarySize != nil {
- sync.MaxSyncBinarySize = *req.MaxSyncBinarySize
+ syncRecord.MaxSyncBinarySize = *req.MaxSyncBinarySize
}
lifecycleCfg := lifecycleConfigInputInternal{
@@ -709,57 +709,57 @@ func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string
if err := s.validateLifecycleConfigInternal(ctx, nil, lifecycleCfg); err != nil {
return nil, err
}
- applyLifecycleFieldsToSyncInternal(&sync, lifecycleCfg)
+ applyLifecycleFieldsToSyncInternal(&syncRecord, lifecycleCfg)
// Select("*") forces explicit zero values (e.g. "0 = unlimited" sync limits and
// unset pre-deploy fields) to persist instead of GORM substituting column defaults.
- if err := s.db.WithContext(ctx).Select("*").Omit("Environment", "Repository", "Project").Create(&sync).Error; err != nil { //nolint:unqueryvet // intentional Select("*"); see comment above
+ if err := s.db.WithContext(ctx).Select("*").Omit("Environment", "Repository", "Project").Create(&syncRecord).Error; err != nil { //nolint:unqueryvet // intentional Select("*"); see comment above
slog.ErrorContext(ctx, "Failed to create GitOps sync in database", "name", req.Name, "repositoryID", req.RepositoryID, "environmentID", environmentID, "error", err)
return nil, errors.WrapIf(err, "failed to create sync")
}
- slog.InfoContext(ctx, "GitOps sync created successfully", "syncID", sync.ID, "name", sync.Name)
+ slog.InfoContext(ctx, "GitOps sync created successfully", "syncID", syncRecord.ID, "name", syncRecord.Name)
// Log event
_, _ = s.eventService.CreateEvent(ctx, CreateEventRequest{
Type: models.EventTypeGitSyncCreate,
Severity: models.EventSeveritySuccess,
Title: "Git sync created",
- Description: fmt.Sprintf("Created git sync configuration '%s'", sync.Name),
+ Description: fmt.Sprintf("Created git sync configuration '%s'", syncRecord.Name),
ResourceType: new("git_sync"),
- ResourceID: new(sync.ID),
- ResourceName: new(sync.Name),
+ ResourceID: new(syncRecord.ID),
+ ResourceName: new(syncRecord.Name),
UserID: new(actor.ID),
Username: new(actor.Username),
- EnvironmentID: new(sync.EnvironmentID),
+ EnvironmentID: new(syncRecord.EnvironmentID),
})
- if _, err := s.PerformSync(ctx, sync.EnvironmentID, sync.ID, actor); err != nil {
- slog.ErrorContext(ctx, "Failed to perform initial sync after creation", "syncId", sync.ID, "error", err)
+ if _, err := s.PerformSync(ctx, syncRecord.EnvironmentID, syncRecord.ID, actor); err != nil {
+ slog.ErrorContext(ctx, "Failed to perform initial sync after creation", "syncId", syncRecord.ID, "error", err)
// Don't fail the entire creation - the sync config exists and can be retried
}
// Register the recurring job if auto-sync is on. The initial sync above already
// ran once, so no extra kick is needed here.
- if sync.AutoSync {
- s.registerSyncJobInternal(ctx, sync.ID, sync.EnvironmentID, sync.SyncInterval)
+ if syncRecord.AutoSync {
+ s.registerSyncJobInternal(ctx, syncRecord.ID, syncRecord.EnvironmentID, syncRecord.SyncInterval)
}
- return s.GetSyncByID(ctx, "", sync.ID)
+ return s.GetSyncByID(ctx, "", syncRecord.ID)
}
func (s *GitOpsSyncService) UpdateSync(ctx context.Context, environmentID, id string, req gitops.UpdateSyncRequest, actor models.User) (*models.GitOpsSync, error) {
- sync, err := s.GetSyncByID(ctx, environmentID, id)
+ syncRecord, err := s.GetSyncByID(ctx, environmentID, id)
if err != nil {
return nil, err
}
// Capture state needed to reconcile the dynamic job after the update.
- oldAutoSync := sync.AutoSync
- newAutoSync := sync.AutoSync
+ oldAutoSync := syncRecord.AutoSync
+ newAutoSync := syncRecord.AutoSync
if req.AutoSync != nil {
newAutoSync = *req.AutoSync
}
- newInterval := sync.SyncInterval
+ newInterval := syncRecord.SyncInterval
if req.SyncInterval != nil {
newInterval = *req.SyncInterval
}
@@ -821,13 +821,13 @@ func (s *GitOpsSyncService) UpdateSync(ctx context.Context, environmentID, id st
networkMode: req.PreDeployNetworkMode,
syncDirectory: req.SyncDirectory,
}
- if err := s.validateLifecycleConfigInternal(ctx, sync, lifecycleCfg); err != nil {
+ if err := s.validateLifecycleConfigInternal(ctx, syncRecord, lifecycleCfg); err != nil {
return nil, err
}
addLifecycleUpdatesInternal(updates, lifecycleCfg)
if len(updates) > 0 {
- if err := s.db.WithContext(ctx).Model(sync).Updates(updates).Error; err != nil {
+ if err := s.db.WithContext(ctx).Model(syncRecord).Updates(updates).Error; err != nil {
return nil, errors.WrapIf(err, "failed to update sync")
}
@@ -836,26 +836,26 @@ func (s *GitOpsSyncService) UpdateSync(ctx context.Context, environmentID, id st
Type: models.EventTypeGitSyncUpdate,
Severity: models.EventSeveritySuccess,
Title: "Git sync updated",
- Description: fmt.Sprintf("Updated git sync configuration '%s'", sync.Name),
+ Description: fmt.Sprintf("Updated git sync configuration '%s'", syncRecord.Name),
ResourceType: new("git_sync"),
- ResourceID: new(sync.ID),
- ResourceName: new(sync.Name),
+ ResourceID: new(syncRecord.ID),
+ ResourceName: new(syncRecord.Name),
UserID: new(actor.ID),
Username: new(actor.Username),
- EnvironmentID: new(sync.EnvironmentID),
+ EnvironmentID: new(syncRecord.EnvironmentID),
})
}
// Reconcile the dynamic job to match the new state.
switch {
case newAutoSync:
- s.registerSyncJobInternal(ctx, sync.ID, sync.EnvironmentID, newInterval)
+ s.registerSyncJobInternal(ctx, syncRecord.ID, syncRecord.EnvironmentID, newInterval)
if !oldAutoSync {
// Freshly enabled β€” kick a run now so it doesn't wait a full interval.
- s.kickSyncInternal(ctx, sync.ID, sync.EnvironmentID)
+ s.kickSyncInternal(ctx, syncRecord.ID, syncRecord.EnvironmentID)
}
default:
- s.unregisterSyncJobInternal(ctx, sync.ID)
+ s.unregisterSyncJobInternal(ctx, syncRecord.ID)
}
return s.GetSyncByID(ctx, environmentID, id)
@@ -870,7 +870,7 @@ func (s *GitOpsSyncService) DeleteSync(ctx context.Context, environmentID, id st
// Best-effort load for the audit-event metadata. A corrupt or env-mismatched row
// must still be deletable, so a load failure falls through to the direct delete
// below instead of aborting.
- sync, loadErr := s.getSyncRecordByIDInternal(ctx, environmentID, id)
+ syncRecord, loadErr := s.getSyncRecordByIDInternal(ctx, environmentID, id)
if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
// Clear gitops_managed_by for any project still pointing at this sync, keyed
@@ -891,8 +891,8 @@ func (s *GitOpsSyncService) DeleteSync(ctx context.Context, environmentID, id st
return nil
}); err != nil {
// Re-register the recurring job only when we actually loaded an auto-sync row.
- if loadErr == nil && sync.AutoSync {
- s.registerSyncJobInternal(ctx, sync.ID, sync.EnvironmentID, sync.SyncInterval)
+ if loadErr == nil && syncRecord.AutoSync {
+ s.registerSyncJobInternal(ctx, syncRecord.ID, syncRecord.EnvironmentID, syncRecord.SyncInterval)
}
return err
}
@@ -907,13 +907,13 @@ func (s *GitOpsSyncService) DeleteSync(ctx context.Context, environmentID, id st
Type: models.EventTypeGitSyncDelete,
Severity: models.EventSeverityInfo,
Title: "Git sync deleted",
- Description: fmt.Sprintf("Deleted git sync configuration '%s'", sync.Name),
+ Description: fmt.Sprintf("Deleted git sync configuration '%s'", syncRecord.Name),
ResourceType: new("git_sync"),
- ResourceID: new(sync.ID),
- ResourceName: new(sync.Name),
+ ResourceID: new(syncRecord.ID),
+ ResourceName: new(syncRecord.Name),
UserID: new(actor.ID),
Username: new(actor.Username),
- EnvironmentID: new(sync.EnvironmentID),
+ EnvironmentID: new(syncRecord.EnvironmentID),
})
return nil
@@ -932,7 +932,7 @@ func (s *GitOpsSyncService) PerformSync(ctx context.Context, environmentID, id s
syncCtx, cancel := context.WithTimeout(ctx, defaultGitSyncTimeout)
defer cancel()
- sync, err := s.GetSyncByID(syncCtx, environmentID, id)
+ syncRecord, err := s.GetSyncByID(syncCtx, environmentID, id)
if err != nil {
return nil, err
}
@@ -942,7 +942,7 @@ func (s *GitOpsSyncService) PerformSync(ctx context.Context, environmentID, id s
SyncedAt: time.Now(),
}
- source, err := s.prepareSyncSource(syncCtx, sync, result, actor)
+ source, err := s.prepareSyncSource(syncCtx, syncRecord, result, actor)
if source != nil && source.repoPath != "" {
defer func() {
if cleanupErr := s.repoService.gitClient.Cleanup(source.repoPath); cleanupErr != nil {
@@ -957,15 +957,15 @@ func (s *GitOpsSyncService) PerformSync(ctx context.Context, environmentID, id s
return result, errors.New("prepared sync source is missing")
}
- if sync.TargetType == "swarm_stack" {
- return s.performSwarmStackSyncInternal(syncCtx, sync, id, actor, result, source)
+ if syncRecord.TargetType == "swarm_stack" {
+ return s.performSwarmStackSyncInternal(syncCtx, syncRecord, id, actor, result, source)
}
- if sync.SyncDirectory {
- return s.performDirectorySync(syncCtx, sync, id, actor, result, source)
+ if syncRecord.SyncDirectory {
+ return s.performDirectorySync(syncCtx, syncRecord, id, actor, result, source)
}
- return s.performSingleFileSyncInternal(syncCtx, sync, id, actor, result, source)
+ return s.performSingleFileSyncInternal(syncCtx, syncRecord, id, actor, result, source)
}
// prepareSyncSource clones the source repository, validates that the configured
@@ -1259,23 +1259,23 @@ func (s *GitOpsSyncService) updateSyncStatus(ctx context.Context, id, status, er
}
func (s *GitOpsSyncService) GetSyncStatus(ctx context.Context, environmentID, id string) (*gitops.SyncStatus, error) {
- sync, err := s.GetSyncByID(ctx, environmentID, id)
+ syncRecord, err := s.GetSyncByID(ctx, environmentID, id)
if err != nil {
return nil, err
}
status := &gitops.SyncStatus{
- ID: sync.ID,
- AutoSync: sync.AutoSync,
- LastSyncAt: sync.LastSyncAt,
- LastSyncStatus: sync.LastSyncStatus,
- LastSyncError: sync.LastSyncError,
- LastSyncCommit: sync.LastSyncCommit,
+ ID: syncRecord.ID,
+ AutoSync: syncRecord.AutoSync,
+ LastSyncAt: syncRecord.LastSyncAt,
+ LastSyncStatus: syncRecord.LastSyncStatus,
+ LastSyncError: syncRecord.LastSyncError,
+ LastSyncCommit: syncRecord.LastSyncCommit,
}
// Calculate next sync time
- if sync.AutoSync && sync.LastSyncAt != nil {
- status.NextSyncAt = new(sync.LastSyncAt.Add(time.Duration(sync.SyncInterval) * time.Minute))
+ if syncRecord.AutoSync && syncRecord.LastSyncAt != nil {
+ status.NextSyncAt = new(syncRecord.LastSyncAt.Add(time.Duration(syncRecord.SyncInterval) * time.Minute))
}
return status, nil
@@ -1384,12 +1384,12 @@ func (s *GitOpsSyncService) BrowseFiles(ctx context.Context, environmentID, id s
browseCtx, cancel := context.WithTimeout(ctx, defaultGitSyncTimeout)
defer cancel()
- sync, err := s.GetSyncByID(browseCtx, environmentID, id)
+ syncRecord, err := s.GetSyncByID(browseCtx, environmentID, id)
if err != nil {
return nil, err
}
- repository := sync.Repository
+ repository := syncRecord.Repository
if repository == nil {
return nil, errors.New("repository not found")
}
@@ -1400,7 +1400,7 @@ func (s *GitOpsSyncService) BrowseFiles(ctx context.Context, environmentID, id s
}
// Clone the repository
- repoPath, err := s.repoService.gitClient.Clone(browseCtx, repository.URL, sync.Branch, authConfig)
+ repoPath, err := s.repoService.gitClient.Clone(browseCtx, repository.URL, syncRecord.Branch, authConfig)
if err != nil {
return nil, errors.WrapIf(err, "failed to clone repository")
}
diff --git a/backend/internal/services/image_attestations_service.go b/backend/internal/services/image_attestations_service.go
index ebc98334a..552b33d1e 100644
--- a/backend/internal/services/image_attestations_service.go
+++ b/backend/internal/services/image_attestations_service.go
@@ -20,7 +20,6 @@ import (
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/go-containerregistry/pkg/v1/remote/transport"
- "github.com/google/go-containerregistry/pkg/v1/types"
"github.com/klauspost/compress/zstd"
attestationTypes "github.com/moby/buildkit/util/attestation"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -478,7 +477,7 @@ func readAttestationLayerInternal(ctx context.Context, attestationImage v1.Image
if err := ctx.Err(); err != nil {
return imagetypes.Attestation{}, false, err
}
- if layerDescriptor.MediaType != types.MediaType(inTotoLayerMediaTypeInternal) {
+ if layerDescriptor.MediaType != inTotoLayerMediaTypeInternal {
return imagetypes.Attestation{}, false, nil
}
diff --git a/backend/internal/services/image_attestations_service_test.go b/backend/internal/services/image_attestations_service_test.go
index 5f1babe3a..50b9c81c3 100644
--- a/backend/internal/services/image_attestations_service_test.go
+++ b/backend/internal/services/image_attestations_service_test.go
@@ -6,7 +6,6 @@ import (
"testing"
"github.com/google/go-containerregistry/pkg/v1/static"
- "github.com/google/go-containerregistry/pkg/v1/types"
"github.com/klauspost/compress/zstd"
)
@@ -22,7 +21,7 @@ func TestReadAttestationLayerBytesInternalDecompressesGzip(t *testing.T) {
t.Fatalf("gzip close: %v", err)
}
- layer := static.NewLayer(buf.Bytes(), types.MediaType(inTotoLayerMediaTypeInternal))
+ layer := static.NewLayer(buf.Bytes(), inTotoLayerMediaTypeInternal)
got, err := readAttestationLayerBytesInternal(layer, "sha256:test")
if err != nil {
t.Fatalf("unexpected error: %v", err)
@@ -35,7 +34,7 @@ func TestReadAttestationLayerBytesInternalDecompressesGzip(t *testing.T) {
func TestReadAttestationLayerBytesInternalPassesThroughRawJSON(t *testing.T) {
statement := []byte(`{"predicateType":"https://spdx.dev/Document"}`)
- layer := static.NewLayer(statement, types.MediaType(inTotoLayerMediaTypeInternal))
+ layer := static.NewLayer(statement, inTotoLayerMediaTypeInternal)
got, err := readAttestationLayerBytesInternal(layer, "sha256:test")
if err != nil {
t.Fatalf("unexpected error: %v", err)
@@ -57,7 +56,7 @@ func TestReadAttestationLayerBytesInternalDecompressesZstd(t *testing.T) {
t.Fatalf("zstd close: %v", err)
}
- layer := static.NewLayer(compressed, types.MediaType(inTotoLayerMediaTypeInternal))
+ layer := static.NewLayer(compressed, inTotoLayerMediaTypeInternal)
got, err := readAttestationLayerBytesInternal(layer, "sha256:test")
if err != nil {
t.Fatalf("unexpected error: %v", err)
diff --git a/backend/internal/services/image_service_test.go b/backend/internal/services/image_service_test.go
index 930617a43..70f270885 100644
--- a/backend/internal/services/image_service_test.go
+++ b/backend/internal/services/image_service_test.go
@@ -203,7 +203,7 @@ func TestGetPullOptionsWithAuth_ExternalCredentialsOverrideDBRegistryInternal(t
func TestImageServicePullImageRetriesAnonymouslyAfterAuthRejectedInternal(t *testing.T) {
db := setupProjectTestDB(t)
- authHeaders := []string{}
+ var authHeaders []string
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if !strings.HasSuffix(r.URL.Path, "/images/create") {
http.NotFound(w, r)
diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.go
index 28cd63926..1f50bf297 100644
--- a/backend/internal/services/image_update_service.go
+++ b/backend/internal/services/image_update_service.go
@@ -554,14 +554,14 @@ func (s *ImageUpdateService) getImageRefByIDInternal(ctx context.Context, imageI
imageID = strings.TrimPrefix(imageID, "sha256:")
- if ref, refErr := s.resolveImageRefFromInspect(ctx, dockerClient, imageID); refErr == nil {
- return ref, nil
+ if imageRef, refErr := s.resolveImageRefFromInspect(ctx, dockerClient, imageID); refErr == nil {
+ return imageRef, nil
}
// Fallback: if the image was pruned, look up the image reference from
// running containers that were started from this image ID.
- if ref, refErr := s.resolveImageRefFromContainers(ctx, dockerClient, imageID); refErr == nil {
- return ref, nil
+ if imageRef, refErr := s.resolveImageRefFromContainers(ctx, dockerClient, imageID); refErr == nil {
+ return imageRef, nil
}
return "", errors.Errorf("image not found: no local image or running container found for %s", imageID)
@@ -580,9 +580,9 @@ func (s *ImageUpdateService) resolveImageRefFromInspect(ctx context.Context, doc
return tag, nil
}
}
- for _, digest := range inspectResponse.RepoDigests {
- if digest != "<none>@<none>" {
- if repo, _, ok := strings.Cut(digest, "@"); ok {
+ for _, digestValue := range inspectResponse.RepoDigests {
+ if digestValue != "<none>@<none>" {
+ if repo, _, ok := strings.Cut(digestValue, "@"); ok {
return repo + ":latest", nil
}
}
@@ -668,16 +668,16 @@ func (s *ImageUpdateService) inspectLocalImageSnapshotInternal(ctx context.Conte
// Extract all digests from RepoDigests
if len(inspectResponse.RepoDigests) > 0 {
for _, repoDigest := range inspectResponse.RepoDigests {
- digest, ok := digest.FromReferenceSuffix(repoDigest)
+ digestValue, ok := digest.FromReferenceSuffix(repoDigest)
if !ok {
continue
}
- allDigests = append(allDigests, digest)
+ allDigests = append(allDigests, digestValue)
// Use first digest as primary if not yet set
if primaryDigest == "" {
- primaryDigest = digest
+ primaryDigest = digestValue
}
}
}
@@ -1099,8 +1099,8 @@ func (r *batchImageProgressRecorder) recordInternal(refs []string, res *imageupd
r.completed++
progress := 10 + int(float64(r.completed)/float64(r.total)*80)
- for _, ref := range refs {
- r.results[ref] = res
+ for _, imageRef := range refs {
+ r.results[imageRef] = res
}
return progress
}
@@ -1111,15 +1111,15 @@ func (s *ImageUpdateService) parseAndGroupImagesInternal(imageRefs []string) (ma
var images []batchImage
indexByNormalizedRef := make(map[string]int)
- for _, ref := range imageRefs {
- if result, ok := digestPinnedImageUpdateResultInternal(ref).Get(); ok {
- results[ref] = result
+ for _, imageRef := range imageRefs {
+ if result, ok := digestPinnedImageUpdateResultInternal(imageRef).Get(); ok {
+ results[imageRef] = result
continue
}
- parts := s.parseImageReference(ref)
+ parts := s.parseImageReference(imageRef)
if parts == nil {
- results[ref] = &imageupdate.Response{
+ results[imageRef] = &imageupdate.Response{
Error: "Invalid image reference format",
CheckTime: time.Now(),
ResponseTimeMs: 0,
@@ -1132,14 +1132,14 @@ func (s *ImageUpdateService) parseAndGroupImagesInternal(imageRefs []string) (ma
regRepos[parts.Registry][s.normalizeRepository(parts.Registry, parts.Repository)] = struct{}{}
normalizedRef := strings.ToLower(fmt.Sprintf("%s/%s:%s", parts.Registry, s.normalizeRepository(parts.Registry, parts.Repository), parts.Tag))
if idx, exists := indexByNormalizedRef[normalizedRef]; exists {
- images[idx].refs = append(images[idx].refs, ref)
+ images[idx].refs = append(images[idx].refs, imageRef)
continue
}
indexByNormalizedRef[normalizedRef] = len(images)
images = append(images, batchImage{
- refs: []string{ref},
- canonicalRef: ref,
+ refs: []string{imageRef},
+ canonicalRef: imageRef,
parts: parts,
})
}
@@ -1269,12 +1269,12 @@ func (s *ImageUpdateService) resolveBatchCredentialsInternal(ctx context.Context
}
func (s *ImageUpdateService) checkBatchImageInternal(ctx context.Context, activityID string, resolvedCreds []containerregistry.Credential, img batchImage, composeBuildRefs map[string]struct{}, recorder *batchImageProgressRecorder) error {
- registry := img.parts.Registry
+ registryRecord := img.parts.Registry
- if err := s.registryLimiter.Acquire(ctx, registry); err != nil {
+ if err := s.registryLimiter.Acquire(ctx, registryRecord); err != nil {
slog.DebugContext(ctx, "skipping image check: registry limiter acquire failed",
"imageRef", img.canonicalRef,
- "registry", registry,
+ "registry", registryRecord,
"error", err.Error())
if ctx.Err() != nil {
return ctx.Err()
@@ -1289,7 +1289,7 @@ func (s *ImageUpdateService) checkBatchImageInternal(ctx context.Context, activi
s.recordBatchImageCheckInternal(ctx, activityID, img, res, nil, recorder)
return nil
}
- defer s.registryLimiter.Release(registry)
+ defer s.registryLimiter.Release(registryRecord)
res, snapshot := s.checkSingleImageInBatchInternal(ctx, resolvedCreds, img.parts, composeBuildRefs)
if ctx.Err() != nil {
diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.go
index cf841ada0..d01f30d1c 100644
--- a/backend/internal/services/image_update_service_test.go
+++ b/backend/internal/services/image_update_service_test.go
@@ -550,16 +550,16 @@ func TestImageUpdateService_GetImageRefByIDInternal_UsesContainerFallback(t *tes
dockerService: &DockerClientService{client: newTestDockerClient(t, server)},
}
- ref, err := svc.getImageRefByIDInternal(context.Background(), imageID)
+ imageRef, err := svc.getImageRefByIDInternal(context.Background(), imageID)
if tt.wantErr != "" {
require.Error(t, err)
assert.ErrorContains(t, err, tt.wantErr)
- assert.Empty(t, ref)
+ assert.Empty(t, imageRef)
return
}
require.NoError(t, err)
- assert.Equal(t, tt.wantRef, ref)
+ assert.Equal(t, tt.wantRef, imageRef)
})
}
}
@@ -1601,12 +1601,12 @@ func TestImageUpdateService_SendBatchNotifications_PartialFailureStillMarksNotif
}))
defer broken.Close()
- for _, url := range []string{healthy.URL, broken.URL} {
+ for _, serverURL := range []string{healthy.URL, broken.URL} {
require.NoError(t, db.Create(&models.NotificationSettings{
Provider: models.NotificationProviderGeneric,
Enabled: true,
Config: models.JSON{
- "webhookUrl": url,
+ "webhookUrl": serverURL,
"method": "POST",
"contentType": "application/json",
},
@@ -1714,12 +1714,12 @@ func TestImageUpdateService_ParseAndGroupImages_DedupesNormalizedRefs(t *testing
require.Len(t, regRepos["docker.io"], 2)
firstRefSet := map[string]struct{}{}
- for _, ref := range grouped[0].refs {
- firstRefSet[ref] = struct{}{}
+ for _, imageRef := range grouped[0].refs {
+ firstRefSet[imageRef] = struct{}{}
}
secondRefSet := map[string]struct{}{}
- for _, ref := range grouped[1].refs {
- secondRefSet[ref] = struct{}{}
+ for _, imageRef := range grouped[1].refs {
+ secondRefSet[imageRef] = struct{}{}
}
// Each normalized image should only be checked once, while retaining all aliases.
@@ -1767,8 +1767,8 @@ func newBlockedDockerAPIServerInternal(t *testing.T, pathContains string) *httpt
}
func containsAll(set map[string]struct{}, refs ...string) bool {
- for _, ref := range refs {
- if _, ok := set[ref]; !ok {
+ for _, imageRef := range refs {
+ if _, ok := set[imageRef]; !ok {
return false
}
}
diff --git a/backend/internal/services/job_service.go b/backend/internal/services/job_service.go
index c9a8b7c42..ce4f90dcb 100644
--- a/backend/internal/services/job_service.go
+++ b/backend/internal/services/job_service.go
@@ -363,16 +363,16 @@ func (s *JobService) getRunnableJobInternal(jobID string) (schedulertypes.Job, e
return nil, errors.New("job service or scheduler not initialized")
}
- meta, ok := meta.GetJobMetadata(jobID)
+ jobMeta, ok := meta.GetJobMetadata(jobID)
if !ok {
return nil, errors.Errorf("unknown job: %s", jobID)
}
- if !meta.CanRunManually {
+ if !jobMeta.CanRunManually {
return nil, errors.Errorf("job %s cannot be run manually", jobID)
}
- if s.cfg != nil && s.cfg.AgentMode && meta.ManagerOnly {
+ if s.cfg != nil && s.cfg.AgentMode && jobMeta.ManagerOnly {
return nil, errors.Errorf("job %s is manager-only and cannot run in agent mode", jobID)
}
diff --git a/backend/internal/services/notification_service_test.go b/backend/internal/services/notification_service_test.go
index c66e448a2..ae3c31e09 100644
--- a/backend/internal/services/notification_service_test.go
+++ b/backend/internal/services/notification_service_test.go
@@ -163,7 +163,7 @@ func TestNotificationService_DispatchNotification_UnsupportedKindReturnsSentinel
}).Error)
_, err := svc.DispatchNotification(ctx, token, notificationdto.DispatchRequest{
- Kind: notificationdto.DispatchKind("bogus_kind"),
+ Kind: "bogus_kind",
})
require.Error(t, err)
diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.go
index cae4e693c..f9392c5ce 100644
--- a/backend/internal/services/oidc_service.go
+++ b/backend/internal/services/oidc_service.go
@@ -72,14 +72,14 @@ func NewOidcService(authService *AuthService, settingsService *SettingsService,
}
func (s *OidcService) getEffectiveConfigInternal(ctx context.Context) (*models.OidcConfig, error) {
- config, err := s.authService.GetOidcConfig(ctx)
+ oidcConfig, err := s.authService.GetOidcConfig(ctx)
if err != nil {
return nil, errors.WrapIf(err, "failed to get OIDC config")
}
- if config.IssuerURL == "" {
+ if oidcConfig.IssuerURL == "" {
return nil, errors.New("issuer URL must be configured")
}
- return config, nil
+ return oidcConfig, nil
}
func (s *OidcService) getHttpClientInternal(skipTlsVerify bool) *http.Client {
@@ -218,18 +218,18 @@ func (s *OidcService) ValidateMobileRedirectURI(ctx context.Context, uri string)
}
func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, origin string, mobileRedirectURI string) (string, string, error) {
- config, err := s.getEffectiveConfigInternal(ctx)
+ oidcConfig, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
slog.Error("GenerateAuthURL: failed to get OIDC config", "error", err)
return "", "", err
}
var provider *oidc.Provider
- if !s.hasManualEndpointsInternal(config) {
+ if !s.hasManualEndpointsInternal(oidcConfig) {
var err error
- provider, err = s.getOrDiscoverProviderInternal(ctx, config)
+ provider, err = s.getOrDiscoverProviderInternal(ctx, oidcConfig)
if err != nil {
- slog.Error("GenerateAuthURL: provider discovery failed", "issuer", config.IssuerURL, "error", err)
+ slog.Error("GenerateAuthURL: provider discovery failed", "issuer", oidcConfig.IssuerURL, "error", err)
return "", "", errors.WrapIf(err, "failed to discover provider")
}
}
@@ -238,7 +238,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, or
nonce := utils.GenerateRandomString(32)
codeVerifier := utils.GenerateRandomString(128)
- oauth2Config, err := s.getOauth2ConfigInternal(config, provider, origin, mobileRedirectURI)
+ oauth2Config, err := s.getOauth2ConfigInternal(oidcConfig, provider, origin, mobileRedirectURI)
if err != nil {
slog.Error("GenerateAuthURL: invalid OIDC endpoints", "error", err)
return "", "", err
@@ -264,7 +264,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, or
}
encodedState := base64.URLEncoding.EncodeToString(stateJSON)
- slog.Debug("GenerateAuthURL: generated authorization URL", "issuer", config.IssuerURL, "scopes", oauth2Config.Scopes)
+ slog.Debug("GenerateAuthURL: generated authorization URL", "issuer", oidcConfig.IssuerURL, "scopes", oauth2Config.Scopes)
return authURL, encodedState, nil
}
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index 9f242748d..300f3d7ac 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -304,8 +304,8 @@ func (s *ProjectService) lookupProjectByCachedComposeNameInternal(ctx context.Co
return nil, false, nil
}
- var project models.Project
- if err := s.db.WithContext(ctx).Where("id = ?", projectID).First(&project).Error; err != nil {
+ var projectModel models.Project
+ if err := s.db.WithContext(ctx).Where("id = ?", projectID).First(&projectModel).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
s.invalidateCachedComposeProjectIDInternal(normalizedName)
return nil, false, nil
@@ -315,12 +315,12 @@ func (s *ProjectService) lookupProjectByCachedComposeNameInternal(ctx context.Co
}
return nil, false, errors.WrapIf(err, "failed to get project by cached compose name")
}
- if projects.NormalizeProjectName(project.Name) != normalizedName {
+ if projects.NormalizeProjectName(projectModel.Name) != normalizedName {
s.invalidateCachedComposeProjectIDInternal(normalizedName)
return nil, false, nil
}
- return &project, true, nil
+ return &projectModel, true, nil
}
func (s *ProjectService) rebuildComposeNameCacheInternal(ctx context.Context) error {
@@ -348,8 +348,8 @@ func (s *ProjectService) rebuildComposeNameCacheInternal(ctx context.Context) er
}
func (s *ProjectService) GetProjectFromDatabaseByID(ctx context.Context, id string) (*models.Project, error) {
- var project models.Project
- if err := s.db.WithContext(ctx).Where("id = ?", id).First(&project).Error; err != nil {
+ var projectModel models.Project
+ if err := s.db.WithContext(ctx).Where("id = ?", id).First(&projectModel).Error; err != nil {
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return nil, errors.New("request canceled or timed out")
}
@@ -358,7 +358,7 @@ func (s *ProjectService) GetProjectFromDatabaseByID(ctx context.Context, id stri
}
return nil, errors.WrapIf(err, "failed to get project")
}
- return &project, nil
+ return &projectModel, nil
}
func (s *ProjectService) GetProjectByComposeName(ctx context.Context, name string) (*models.Project, error) {
@@ -402,12 +402,12 @@ func (s *ProjectService) resolveProjectComposeFileInternal(ctx context.Context,
}
if proj.GitOpsManagedBy != nil && strings.TrimSpace(*proj.GitOpsManagedBy) != "" {
- var sync models.GitOpsSync
+ var syncRecord models.GitOpsSync
if err := s.db.WithContext(ctx).
Select("compose_path").
Where("id = ?", *proj.GitOpsManagedBy).
- First(&sync).Error; err == nil {
- composeFileName := strings.TrimSpace(filepath.Base(sync.ComposePath))
+ First(&syncRecord).Error; err == nil {
+ composeFileName := strings.TrimSpace(filepath.Base(syncRecord.ComposePath))
if composeFileName != "" && composeFileName != "." {
candidate := filepath.Join(proj.Path, composeFileName)
if info, statErr := os.Stat(candidate); statErr == nil {
@@ -1431,11 +1431,11 @@ func (s *ProjectService) enrichWithProjectFiles(ctx context.Context, projectPath
func (s *ProjectService) enrichWithGitOpsInfo(ctx context.Context, proj *models.Project, resp *project.Details) {
if proj.GitOpsManagedBy != nil {
- var sync models.GitOpsSync
- if err := s.db.WithContext(ctx).Preload("Repository").Where("id = ?", *proj.GitOpsManagedBy).First(&sync).Error; err == nil {
- resp.LastSyncCommit = sync.LastSyncCommit
- if sync.Repository != nil {
- resp.GitRepositoryURL = sync.Repository.URL
+ var syncRecord models.GitOpsSync
+ if err := s.db.WithContext(ctx).Preload("Repository").Where("id = ?", *proj.GitOpsManagedBy).First(&syncRecord).Error; err == nil {
+ resp.LastSyncCommit = syncRecord.LastSyncCommit
+ if syncRecord.Repository != nil {
+ resp.GitRepositoryURL = syncRecord.Repository.URL
}
}
}
@@ -1652,8 +1652,8 @@ func (s activeProjectRenameSyncStateInternal) skipDiscoveredPathInternal(path st
}
func (s activeProjectRenameSyncStateInternal) markProtectedPathsSeenInternal(seen map[string]struct{}) {
- for path := range s.protectSeenPaths {
- seen[path] = struct{}{}
+ for seenPath := range s.protectSeenPaths {
+ seen[seenPath] = struct{}{}
}
}
@@ -2084,7 +2084,7 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
}
}
- project, _, derr := s.loadComposeProjectForProjectInternal(ctx, projectFromDb, nil)
+ projectModel, _, derr := s.loadComposeProjectForProjectInternal(ctx, projectFromDb, nil)
if derr != nil {
s.restoreProjectStatusAfterFailedDeployInternal(ctx, projectID)
return errors.WrapIff(derr, "failed to load compose project in %s", projectFromDb.Path)
@@ -2097,7 +2097,7 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
}
progressWriter, _ := ctx.Value(dockerutil.ProgressWriterKey{}).(io.Writer)
- if perr := s.prepareProjectImagesForDeploy(ctx, projectID, project, progressWriter, credentials, &user, resolvedPullPolicy); perr != nil {
+ if perr := s.prepareProjectImagesForDeploy(ctx, projectID, projectModel, progressWriter, credentials, &user, resolvedPullPolicy); perr != nil {
s.restoreProjectStatusAfterFailedDeployInternal(ctx, projectID)
return errors.WrapIf(perr, "failed to prepare project images for deploy")
}
@@ -2105,10 +2105,10 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
gitOpsManaged := projectFromDb.GitOpsManagedBy != nil && *projectFromDb.GitOpsManagedBy != ""
removeOrphans := resolveRemoveOrphansInternal(gitOpsManaged, options)
- slog.Info("starting compose up with health check support", "projectID", projectID, "projectName", project.Name, "services", len(project.Services), "removeOrphans", removeOrphans)
+ slog.Info("starting compose up with health check support", "projectID", projectID, "projectName", projectModel.Name, "services", len(projectModel.Services), "removeOrphans", removeOrphans)
// Health/progress streaming (if any) is handled inside projects.ComposeUp via ctx.
- if err := projects.ComposeUp(ctx, project, nil, removeOrphans, forceRecreate, s.composeRegistryAuthConfigsInternal(ctx)); err != nil {
- slog.Error("compose up failed", "projectName", project.Name, "projectID", projectID, "error", err)
+ if err := projects.ComposeUp(ctx, projectModel, nil, removeOrphans, forceRecreate, s.composeRegistryAuthConfigsInternal(ctx)); err != nil {
+ slog.Error("compose up failed", "projectName", projectModel.Name, "projectID", projectID, "error", err)
if containers, psErr := s.GetProjectServices(ctx, projectID); psErr == nil {
slog.Info("containers after failed deploy", "projectID", projectID, "containers", containers)
}
@@ -2121,10 +2121,10 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
}
return errors.WrapIf(err, "failed to deploy project")
}
- slog.Info("compose up completed successfully", "projectID", projectID, "projectName", project.Name)
+ slog.Info("compose up completed successfully", "projectID", projectID, "projectName", projectModel.Name)
- metadata := models.JSON{"action": "deploy", "projectID": projectID, "projectName": project.Name}
- s.logProjectEventInternal(ctx, models.EventTypeProjectDeploy, projectID, project.Name, user, metadata, "could not log project deployment action")
+ metadata := models.JSON{"action": "deploy", "projectID": projectID, "projectName": projectModel.Name}
+ s.logProjectEventInternal(ctx, models.EventTypeProjectDeploy, projectID, projectModel.Name, user, metadata, "could not log project deployment action")
err = s.updateProjectStatusandCountsInternal(ctx, projectID, models.ProjectStatusRunning)
if err != nil {
@@ -2346,8 +2346,8 @@ func (s *ProjectService) projectRedeployDisabledInternal(ctx context.Context, pr
containersByProject := groupComposeContainersByProjectInternal(containers)
currentContainerID, currentContainerErr := cgroup.CurrentContainerID()
- for _, container := range lookupProjectContainers(proj, containersByProject) {
- if labels.ShouldDisableArcaneServerRedeploy(container.Labels, container.ID, currentContainerID, currentContainerErr) {
+ for _, containerSummary := range lookupProjectContainers(proj, containersByProject) {
+ if labels.ShouldDisableArcaneServerRedeploy(containerSummary.Labels, containerSummary.ID, currentContainerID, currentContainerErr) {
return true
}
}
@@ -2392,12 +2392,12 @@ func (s *ProjectService) BuildProjectServices(ctx context.Context, projectID str
return err
}
- project, _, derr := s.loadComposeProjectForProjectInternal(ctx, projectFromDb, nil)
+ projectModel, _, derr := s.loadComposeProjectForProjectInternal(ctx, projectFromDb, nil)
if derr != nil {
return errors.WrapIff(derr, "failed to load compose project in %s", projectFromDb.Path)
}
- return s.buildProjectServicesInternal(ctx, projectID, project, options, progressWriter, user)
+ return s.buildProjectServicesInternal(ctx, projectID, projectModel, options, progressWriter, user)
}
// EnsureProjectImagesPresent checks all compose service images for the project and
diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.go
index dc773ff27..e61f4839b 100644
--- a/backend/internal/services/project_service_test.go
+++ b/backend/internal/services/project_service_test.go
@@ -1333,11 +1333,11 @@ func TestProjectService_PrepareProjectRenameVolumeMigrationForUpdate_UsesCompose
require.NotNil(t, migration)
journalSource, ok := migration.(volumes.JournalSource)
require.True(t, ok)
- volumes := journalSource.JournalVolumes()
- require.Len(t, volumes, 1)
- require.Equal(t, "data", volumes[0].Key)
- require.Equal(t, "nginx_data", volumes[0].OldName)
- require.Equal(t, "web_data", volumes[0].NewName)
+ journalVolumes := journalSource.JournalVolumes()
+ require.Len(t, journalVolumes, 1)
+ require.Equal(t, "data", journalVolumes[0].Key)
+ require.Equal(t, "nginx_data", journalVolumes[0].OldName)
+ require.Equal(t, "web_data", journalVolumes[0].NewName)
require.Empty(t, projectUpdatePreviewDirsInternal(t, projectsDir))
})
@@ -1350,11 +1350,11 @@ func TestProjectService_PrepareProjectRenameVolumeMigrationForUpdate_UsesCompose
require.NotNil(t, migration)
journalSource, ok := migration.(volumes.JournalSource)
require.True(t, ok)
- volumes := journalSource.JournalVolumes()
- require.Len(t, volumes, 1)
- require.Equal(t, "data", volumes[0].Key)
- require.Equal(t, "nginx_data", volumes[0].OldName)
- require.Equal(t, "web_data", volumes[0].NewName)
+ journalVolumes := journalSource.JournalVolumes()
+ require.Len(t, journalVolumes, 1)
+ require.Equal(t, "data", journalVolumes[0].Key)
+ require.Equal(t, "nginx_data", journalVolumes[0].OldName)
+ require.Equal(t, "web_data", journalVolumes[0].NewName)
require.Empty(t, projectUpdatePreviewDirsInternal(t, projectsDir))
})
@@ -1367,11 +1367,11 @@ func TestProjectService_PrepareProjectRenameVolumeMigrationForUpdate_UsesCompose
require.NotNil(t, migration)
journalSource, ok := migration.(volumes.JournalSource)
require.True(t, ok)
- volumes := journalSource.JournalVolumes()
- require.Len(t, volumes, 1)
- require.Equal(t, "data", volumes[0].Key)
- require.Equal(t, "nginx_data", volumes[0].OldName)
- require.Equal(t, "web_data", volumes[0].NewName)
+ journalVolumes := journalSource.JournalVolumes()
+ require.Len(t, journalVolumes, 1)
+ require.Equal(t, "data", journalVolumes[0].Key)
+ require.Equal(t, "nginx_data", journalVolumes[0].OldName)
+ require.Equal(t, "web_data", journalVolumes[0].NewName)
require.Empty(t, projectUpdatePreviewDirsInternal(t, projectsDir))
})
}
diff --git a/backend/internal/services/role_service.go b/backend/internal/services/role_service.go
index dacfa80fa..a2a92ed9e 100644
--- a/backend/internal/services/role_service.go
+++ b/backend/internal/services/role_service.go
@@ -364,7 +364,7 @@ func (s *RoleService) UpdateRole(ctx context.Context, id, name string, descripti
}
existing.Name = name
existing.Description = description
- existing.Permissions = models.StringSlice(permissions)
+ existing.Permissions = permissions
if err := tx.Save(&existing).Error; err != nil {
return errors.WrapIf(err, "failed to update role")
}
diff --git a/backend/internal/services/settings_search_service.go b/backend/internal/services/settings_search_service.go
index c3184c2f7..1dfa2471f 100644
--- a/backend/internal/services/settings_search_service.go
+++ b/backend/internal/services/settings_search_service.go
@@ -42,7 +42,7 @@ func (s *SettingsSearchService) buildCategoriesFromModel() []category.Category {
// map category id -> list of settings
categories := map[string][]meta.Metadata{}
- categoryOrder := []string{} // Track order from first appearance in struct
+ var categoryOrder []string // Track order from first appearance in struct
rt := reflect.TypeFor[models.Settings]()
for field := range rt.Fields() {
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index ad07e6f9b..af4b944ca 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -361,8 +361,8 @@ func (s *SettingsService) isEnvOverrideActiveInternal(key string) bool {
}
func (s *SettingsService) GetSettings(ctx context.Context) (*models.Settings, error) {
- settings := s.getEffectiveSettingsConfigInternal(ctx)
- return settings, nil
+ settingsCfg := s.getEffectiveSettingsConfigInternal(ctx)
+ return settingsCfg, nil
}
// GetSettingsOrDefaults is a convenience for hot paths that need a snapshot but cannot
@@ -381,9 +381,9 @@ func (s *SettingsService) GetSettingsOrDefaults(ctx context.Context) *models.Set
}
func (s *SettingsService) getEffectiveSettingsConfigInternal(ctx context.Context) *models.Settings {
- settings := s.GetSettingsConfig().Clone()
- s.applyEnvOverrides(ctx, settings)
- return settings
+ settingsCfg := s.GetSettingsConfig().Clone()
+ s.applyEnvOverrides(ctx, settingsCfg)
+ return settingsCfg
}
func (s *SettingsService) UpdateSetting(ctx context.Context, key, value string) error {
@@ -456,7 +456,7 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates settings.U
if err := s.refreshSettingsCacheInternal(ctx); err != nil {
return nil, err
}
- settings := s.GetSettingsConfig()
+ settingsCfg := s.GetSettingsConfig()
// Now call callbacks after in-memory config is updated
if changedPolling && s.OnImagePollingSettingsChanged != nil {
@@ -488,7 +488,7 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates settings.U
s.OnTimeoutSettingsChanged(ctx, changedTimeouts)
}
- return settings.ToSettingVariableSlice(models.SettingVisibilityNonAdmin, false), nil
+ return settingsCfg.ToSettingVariableSlice(models.SettingVisibilityNonAdmin, false), nil
}
func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defaultCfg *models.Settings) ([]models.SettingVariable, bool, bool, bool, bool, bool, []libarcane.SettingUpdate, error) {
diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.go
index e35d76af6..4e1313b3f 100644
--- a/backend/internal/services/settings_service_test.go
+++ b/backend/internal/services/settings_service_test.go
@@ -126,9 +126,9 @@ func TestSettingsService_GetSettings_UsesCachedSnapshotWithoutDatabase(t *testin
// GetSettings should clone the in-memory snapshot and not touch the database.
svc.db = nil
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.Equal(t, "http://cached", settings.BaseServerURL.Value)
+ require.Equal(t, "http://cached", settingsCfg.BaseServerURL.Value)
}
func TestSettingsService_AvatarMaxUploadSizeDefaultAndUpdate(t *testing.T) {
@@ -301,9 +301,9 @@ func TestSettingsService_GetSettings_EnvOverride_OidcMergeAccounts(t *testing.T)
require.NoError(t, err)
require.NoError(t, svc.EnsureDefaultSettings(ctx))
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.True(t, settings.OidcMergeAccounts.IsTrue())
+ require.True(t, settingsCfg.OidcMergeAccounts.IsTrue())
}
func TestSettingsService_GetSettings_EnvOverride_TrivyScanTimeout(t *testing.T) {
@@ -315,9 +315,9 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyScanTimeout(t *testing.T)
require.NoError(t, err)
require.NoError(t, svc.EnsureDefaultSettings(ctx))
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.Equal(t, 1800, settings.TrivyScanTimeout.AsInt())
+ require.Equal(t, 1800, settingsCfg.TrivyScanTimeout.AsInt())
}
func TestSettingsService_GetSettings_EnvOverride_TrivyResourceLimits(t *testing.T) {
@@ -331,11 +331,11 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyResourceLimits(t *testing.
require.NoError(t, err)
require.NoError(t, svc.EnsureDefaultSettings(ctx))
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.False(t, settings.TrivyResourceLimitsEnabled.IsTrue())
- require.Equal(t, "2.5", settings.TrivyCpuLimit.Value)
- require.Equal(t, 2048, settings.TrivyMemoryLimitMb.AsInt())
+ require.False(t, settingsCfg.TrivyResourceLimitsEnabled.IsTrue())
+ require.Equal(t, "2.5", settingsCfg.TrivyCpuLimit.Value)
+ require.Equal(t, 2048, settingsCfg.TrivyMemoryLimitMb.AsInt())
}
func TestSettingsService_GetSettings_EnvOverride_TrivyNetwork(t *testing.T) {
@@ -347,9 +347,9 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyNetwork(t *testing.T) {
require.NoError(t, err)
require.NoError(t, svc.EnsureDefaultSettings(ctx))
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.Equal(t, "arcane-external", settings.TrivyNetwork.Value)
+ require.Equal(t, "arcane-external", settingsCfg.TrivyNetwork.Value)
}
func TestSettingsService_GetSettings_EnvOverride_FollowProjectSymlinks(t *testing.T) {
@@ -361,9 +361,9 @@ func TestSettingsService_GetSettings_EnvOverride_FollowProjectSymlinks(t *testin
require.NoError(t, err)
require.NoError(t, svc.EnsureDefaultSettings(ctx))
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.True(t, settings.FollowProjectSymlinks.IsTrue())
+ require.True(t, settingsCfg.FollowProjectSymlinks.IsTrue())
}
func TestSettingsService_GetSettings_EnvOverride_TrivyRuntimeSecurity(t *testing.T) {
@@ -376,10 +376,10 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyRuntimeSecurity(t *testing
require.NoError(t, err)
require.NoError(t, svc.EnsureDefaultSettings(ctx))
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.Equal(t, "label=disable,\nlabel=type:container_runtime_t", settings.TrivySecurityOpts.Value)
- require.True(t, settings.TrivyPrivileged.IsTrue())
+ require.Equal(t, "label=disable,\nlabel=type:container_runtime_t", settingsCfg.TrivySecurityOpts.Value)
+ require.True(t, settingsCfg.TrivyPrivileged.IsTrue())
}
func TestSettingsService_GetStringSetting_EnvOverride_SwarmStackSourcesDirectory(t *testing.T) {
@@ -460,9 +460,9 @@ func TestSettingsService_UpdateSetting_RefreshesCachedSnapshot(t *testing.T) {
require.Equal(t, "https://arcane.test", svc.GetSettingsConfig().BaseServerURL.Value)
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
require.NoError(t, err)
- require.Equal(t, "https://arcane.test", settings.BaseServerURL.Value)
+ require.Equal(t, "https://arcane.test", settingsCfg.BaseServerURL.Value)
}
func TestSettingsService_UpdateSettings_PruneModesDoNotTriggerScheduledPruneCallback(t *testing.T) {
@@ -521,11 +521,11 @@ func BenchmarkSettingsService_GetSettings(b *testing.B) {
b.ResetTimer()
for b.Loop() {
- settings, err := svc.GetSettings(ctx)
+ settingsCfg, err := svc.GetSettings(ctx)
if err != nil {
b.Fatal(err)
}
- if settings == nil {
+ if settingsCfg == nil {
b.Fatal("settings should not be nil")
}
}
diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.go
index be8c7d687..9fd6c46ba 100644
--- a/backend/internal/services/system_service.go
+++ b/backend/internal/services/system_service.go
@@ -312,8 +312,8 @@ func (s *SystemService) performBatchContainerAction(ctx context.Context, contain
// Limit concurrency to avoid overwhelming Docker daemon
g.SetLimit(5)
- for _, container := range containers {
- c := container // capture loop var
+ for _, containerSummary := range containers {
+ c := containerSummary // capture loop var
if !shouldProcess(c) {
continue
}
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.go
index dd9bbfe08..fcdc1edc9 100644
--- a/backend/internal/services/updater_service.go
+++ b/backend/internal/services/updater_service.go
@@ -732,7 +732,7 @@ func (s *UpdaterService) RecordEvent(ctx context.Context, event updater.Event) e
s.deps.SystemUser.ID,
s.deps.SystemUser.Username,
"0",
- models.JSON(event.Metadata),
+ event.Metadata,
)
}
diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.go
index 42dbd6fc1..67d4f50eb 100644
--- a/backend/internal/services/updater_service_test.go
+++ b/backend/internal/services/updater_service_test.go
@@ -583,7 +583,7 @@ func TestUpdaterService_RecordUpdateRunAdapterInternal(t *testing.T) {
require.NoError(t, db.First(&record, "resource_id = ?", "container-1").Error)
assert.Equal(t, "web", record.ResourceName)
assert.Equal(t, "container", record.ResourceType)
- assert.Equal(t, models.AutoUpdateStatus(string(updater.StatusUpdated)), record.Status)
+ assert.Equal(t, models.AutoUpdateStatus(updater.StatusUpdated), record.Status)
assert.True(t, record.UpdateAvailable)
assert.True(t, record.UpdateApplied)
assert.Equal(t, "nginx:1.2.3", record.OldImageVersions["main"])
diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.go
index 8d89eeed2..255071491 100644
--- a/backend/internal/services/user_service.go
+++ b/backend/internal/services/user_service.go
@@ -518,13 +518,13 @@ func (s *UserService) GetUser(ctx context.Context, userID string) (*models.User,
}
func (s *UserService) getUserInternal(ctx context.Context, userID string, tx *gorm.DB) (*models.User, error) {
- var user models.User
+ var userRecord models.User
err := tx.
WithContext(ctx).
Where("id = ?", userID).
- First(&user).
+ First(&userRecord).
Error
- return &user, err
+ return &userRecord, err
}
// UploadAvatar stores avatar bytes for a user, replacing any existing avatar.
diff --git a/backend/internal/services/user_service_test.go b/backend/internal/services/user_service_test.go
index e5f70935d..1324911d0 100644
--- a/backend/internal/services/user_service_test.go
+++ b/backend/internal/services/user_service_test.go
@@ -18,8 +18,8 @@ func setupUserAndRoleServices(t *testing.T) (*UserService, *RoleService) {
db := setupAuthServiceTestDB(t)
role := NewRoleService(db)
require.NoError(t, role.EnsureBuiltInRoles(context.Background()))
- user := NewUserService(db).WithRoleService(role)
- return user, role
+ userRecord := NewUserService(db).WithRoleService(role)
+ return userRecord, role
}
func createTestUser(t *testing.T, svc *UserService, id, username string) *models.User {
@@ -96,15 +96,15 @@ func TestListUsersPaginatedSetsCanDeleteFromGlobalAdminCount(t *testing.T) {
users, _, err := userSvc.ListUsersPaginated(ctx, pagination.QueryParams{
Params: pagination.Params{Start: 0, Limit: 20},
- SortParams: pagination.SortParams{Sort: "Username", Order: pagination.SortOrder("asc")},
+ SortParams: pagination.SortParams{Sort: "Username", Order: "asc"},
Filters: map[string]string{},
})
require.NoError(t, err)
require.Len(t, users, 2)
canDeleteByID := make(map[string]bool, len(users))
- for _, user := range users {
- canDeleteByID[user.ID] = user.CanDelete
+ for _, userRecord := range users {
+ canDeleteByID[userRecord.ID] = userRecord.CanDelete
}
require.False(t, canDeleteByID[lastAdmin.ID])
@@ -127,7 +127,7 @@ func TestDeleteUserRejectsDeletingOnlyCustomAllPermissionsAdmin(t *testing.T) {
users, _, err := userSvc.ListUsersPaginated(ctx, pagination.QueryParams{
Params: pagination.Params{Start: 0, Limit: 20},
- SortParams: pagination.SortParams{Sort: "Username", Order: pagination.SortOrder("asc")},
+ SortParams: pagination.SortParams{Sort: "Username", Order: "asc"},
Filters: map[string]string{},
})
require.NoError(t, err)
diff --git a/backend/internal/services/version_service.go b/backend/internal/services/version_service.go
index 8ebd70eff..b08d0fe32 100644
--- a/backend/internal/services/version_service.go
+++ b/backend/internal/services/version_service.go
@@ -216,21 +216,21 @@ func (s *VersionService) GetVersionInformation(ctx context.Context, currentVersi
// isSemverVersion checks if a version string is semver-based (e.g., v1.0.0)
func (s *VersionService) isSemverVersion() bool {
- version := strings.TrimSpace(s.version)
- if !strings.HasPrefix(version, "v") {
- version = "v" + version
+ versionValue := strings.TrimSpace(s.version)
+ if !strings.HasPrefix(versionValue, "v") {
+ versionValue = "v" + versionValue
}
- return semver.IsValid(version)
+ return semver.IsValid(versionValue)
}
// getDisplayVersion formats the version for display purposes
// Semver versions (including prereleases like 2.4.0-next.1) display as v<version>
func (s *VersionService) getDisplayVersion() string {
- version := strings.TrimPrefix(strings.TrimSpace(s.version), "v")
+ versionValue := strings.TrimPrefix(strings.TrimSpace(s.version), "v")
if s.isSemverVersion() {
- return "v" + version
+ return "v" + versionValue
}
- return version
+ return versionValue
}
// GetAppVersionInfo returns application version information including display version
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index c193badd0..f18cb9a94 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -786,12 +786,12 @@ func (s *VulnerabilityService) getActionableCountExcludingIgnoredInternal(ctx co
continue
}
- for _, vuln := range vulns {
- if vuln.Severity != vulnerability.SeverityCritical && vuln.Severity != vulnerability.SeverityHigh {
+ for _, vulnEntry := range vulns {
+ if vulnEntry.Severity != vulnerability.SeverityCritical && vulnEntry.Severity != vulnerability.SeverityHigh {
continue
}
if len(ignoredKeys) > 0 {
- key := vulnerabilityIgnoreKeyInternal(record.ID, vuln.VulnerabilityID, vuln.PkgName, vuln.InstalledVersion)
+ key := vulnerabilityIgnoreKeyInternal(record.ID, vulnEntry.VulnerabilityID, vulnEntry.PkgName, vulnEntry.InstalledVersion)
if _, isIgnored := ignoredKeys[key]; isIgnored {
continue
}
@@ -856,16 +856,16 @@ func (s *VulnerabilityService) ListAllVulnerabilities(ctx context.Context, envID
continue
}
- for _, vuln := range vulns {
+ for _, vulnEntry := range vulns {
if len(ignoredKeys) > 0 {
- key := vulnerabilityIgnoreKeyInternal(record.ID, vuln.VulnerabilityID, vuln.PkgName, vuln.InstalledVersion)
+ key := vulnerabilityIgnoreKeyInternal(record.ID, vulnEntry.VulnerabilityID, vulnEntry.PkgName, vulnEntry.InstalledVersion)
if _, isIgnored := ignoredKeys[key]; isIgnored {
continue
}
}
items = append(items, vulnerability.VulnerabilityWithImage{
- Vulnerability: vuln,
+ Vulnerability: vulnEntry,
ImageID: record.ID,
ImageName: record.ImageName,
})
@@ -2433,9 +2433,9 @@ func logTrivyContainerStartupRequestInternal(ctx context.Context, scope string,
resources := containertypes.Resources{}
autoRemove := false
- mounts := []string{}
+ var mounts []string
networkMode := ""
- securityOpts := []string{}
+ var securityOpts []string
privileged := false
if hostConfig != nil {
resources = hostConfig.Resources
@@ -3661,12 +3661,12 @@ func (s *VulnerabilityService) filterIgnoredVulnerabilitiesForImage(
}
filtered := make([]vulnerability.Vulnerability, 0, len(vulns))
- for _, vuln := range vulns {
- key := vulnerabilityIgnoreKeyInternal(imageID, vuln.VulnerabilityID, vuln.PkgName, vuln.InstalledVersion)
+ for _, vulnEntry := range vulns {
+ key := vulnerabilityIgnoreKeyInternal(imageID, vulnEntry.VulnerabilityID, vulnEntry.PkgName, vulnEntry.InstalledVersion)
if _, isIgnored := ignoredKeys[key]; isIgnored {
continue
}
- filtered = append(filtered, vuln)
+ filtered = append(filtered, vulnEntry)
}
return filtered, nil
@@ -3732,8 +3732,8 @@ func (s *VulnerabilityService) ensureSummary(result *vulnerability.ScanResult) {
func buildSeveritySummaryFromVulnerabilitiesInternal(vulns []vulnerability.Vulnerability) *vulnerability.SeveritySummary {
summary := &vulnerability.SeveritySummary{}
- for _, vuln := range vulns {
- switch vuln.Severity {
+ for _, vulnEntry := range vulns {
+ switch vulnEntry.Severity {
case vulnerability.SeverityCritical:
summary.Critical++
case vulnerability.SeverityHigh:
diff --git a/backend/pkg/libarcane/activity/writer.go b/backend/pkg/libarcane/activity/writer.go
index cf4569237..0b7602502 100644
--- a/backend/pkg/libarcane/activity/writer.go
+++ b/backend/pkg/libarcane/activity/writer.go
@@ -69,7 +69,7 @@ func (w *Writer) Write(p []byte) (int, error) {
}
w.mu.Lock()
- messages := []writerAppendMessage{}
+ var messages []writerAppendMessage
w.buffer = append(w.buffer, p...)
for {
idx := bytes.IndexByte(w.buffer, '\n')
@@ -131,7 +131,7 @@ func (w *Writer) processLineInternal(line string) mo.Option[writerAppendMessage]
return mo.Some(writerAppendMessage{
level: models.ActivityMessageLevelError,
message: valueToStringInternal(errorValue),
- payload: models.JSON(payload),
+ payload: payload,
step: w.defaultStep,
})
}
@@ -151,7 +151,7 @@ func (w *Writer) processLineInternal(line string) mo.Option[writerAppendMessage]
return mo.Some(writerAppendMessage{
level: models.ActivityMessageLevelInfo,
message: line,
- payload: models.JSON(payload),
+ payload: payload,
step: w.defaultStep,
})
}
diff --git a/backend/pkg/libarcane/docker_compat_test.go b/backend/pkg/libarcane/docker_compat_test.go
index 21a324a0d..ae832ae73 100644
--- a/backend/pkg/libarcane/docker_compat_test.go
+++ b/backend/pkg/libarcane/docker_compat_test.go
@@ -265,7 +265,7 @@ func TestContainerCreateWithCompatibilityForAPIVersion(t *testing.T) {
_, err := ContainerCreateWithCompatibilityForAPIVersion(t.Context(), fakeClient, client.ContainerCreateOptions{
Config: &container.Config{Image: "nginx:latest"},
HostConfig: &container.HostConfig{
- NetworkMode: container.NetworkMode("anet"),
+ NetworkMode: "anet",
},
NetworkingConfig: &network.NetworkingConfig{
EndpointsConfig: map[string]*network.EndpointSettings{
@@ -300,7 +300,7 @@ func TestContainerCreateWithCompatibilityForAPIVersion(t *testing.T) {
_, err := ContainerCreateWithCompatibilityForAPIVersion(t.Context(), fakeClient, client.ContainerCreateOptions{
HostConfig: &container.HostConfig{
- NetworkMode: container.NetworkMode("anet"),
+ NetworkMode: "anet",
},
NetworkingConfig: &network.NetworkingConfig{
EndpointsConfig: map[string]*network.EndpointSettings{
diff --git a/backend/pkg/libarcane/edge/client_test.go b/backend/pkg/libarcane/edge/client_test.go
index d37ae4bd5..a3e3765a9 100644
--- a/backend/pkg/libarcane/edge/client_test.go
+++ b/backend/pkg/libarcane/edge/client_test.go
@@ -388,8 +388,8 @@ func TestTunnelClient_InternalHelpers(t *testing.T) {
client := NewTunnelClient(cfg, nil)
// Manually connect
- url := "ws" + strings.TrimPrefix(server.URL, "http")
- conn, resp, err := websocket.DefaultDialer.Dial(url, nil)
+ serverURL := "ws" + strings.TrimPrefix(server.URL, "http")
+ conn, resp, err := websocket.DefaultDialer.Dial(serverURL, nil)
require.NoError(t, err)
if resp != nil {
defer func() { _ = resp.Body.Close() }()
@@ -1642,7 +1642,7 @@ func startTestGRPCTunnelServerOnAPIPathInternal(t *testing.T, ctx context.Contex
func startTestTunnelServiceOnAPIPathInternal(t *testing.T, ctx context.Context, service tunnelpb.TunnelServiceServer) (string, func()) {
t.Helper()
- serverOptions := []grpc.ServerOption{}
+ var serverOptions []grpc.ServerOption
if tunnelServer, ok := service.(*TunnelServer); ok {
serverOptions = tunnelServer.GRPCServerOptions()
}
@@ -2016,7 +2016,7 @@ func TestTunnelClient_syncPollManagedSessionInternal_IdleUsesBoundedStopTimeout(
func startTestPollAndGRPCManagerInternal(t *testing.T, ctx context.Context, service tunnelpb.TunnelServiceServer, pollResp TunnelPollResponse) (string, func()) {
t.Helper()
- serverOptions := []grpc.ServerOption{}
+ var serverOptions []grpc.ServerOption
if tunnelServer, ok := service.(*TunnelServer); ok {
serverOptions = tunnelServer.GRPCServerOptions()
}
diff --git a/backend/pkg/libarcane/inspect_compat_test.go b/backend/pkg/libarcane/inspect_compat_test.go
index d9a92a5fb..38717bc15 100644
--- a/backend/pkg/libarcane/inspect_compat_test.go
+++ b/backend/pkg/libarcane/inspect_compat_test.go
@@ -523,7 +523,7 @@ func TestWrapDockerAPIClientForInspectCompatibility_ContainerCreateLegacyNetwork
Image: "nginx:alpine",
},
HostConfig: &containertypes.HostConfig{
- NetworkMode: containertypes.NetworkMode("synobridge"),
+ NetworkMode: "synobridge",
},
NetworkingConfig: &networktypes.NetworkingConfig{
EndpointsConfig: map[string]*networktypes.EndpointSettings{
diff --git a/backend/pkg/libarcane/swarm/convert_mounts.go b/backend/pkg/libarcane/swarm/convert_mounts.go
index 9e86db10f..ecbddab7b 100644
--- a/backend/pkg/libarcane/swarm/convert_mounts.go
+++ b/backend/pkg/libarcane/swarm/convert_mounts.go
@@ -55,7 +55,7 @@ func convertServiceMountsInternal(
if entry.VolumeOptions == nil {
entry.VolumeOptions = &mount.VolumeOptions{}
}
- if !bool(projectVolume.External) {
+ if !projectVolume.External {
entry.VolumeOptions.Labels = mergeLabelsInternal(entry.VolumeOptions.Labels, mergeLabelsInternal(projectVolume.Labels, stackLabels))
entry.VolumeOptions.DriverConfig = &mount.Driver{
Name: projectVolume.Driver,
diff --git a/backend/pkg/libarcane/swarm/convert_service.go b/backend/pkg/libarcane/swarm/convert_service.go
index c59a43bb3..36357ecf7 100644
--- a/backend/pkg/libarcane/swarm/convert_service.go
+++ b/backend/pkg/libarcane/swarm/convert_service.go
@@ -120,7 +120,7 @@ func buildServiceSpecInternal(
if len(service.DNS) > 0 || len(service.DNSSearch) > 0 || len(service.DNSOpts) > 0 {
spec.TaskTemplate.ContainerSpec.DNSConfig = &swarm.DNSConfig{
Nameservers: parseIPListInternal(service.DNS),
- Search: []string(service.DNSSearch),
+ Search: service.DNSSearch,
Options: service.DNSOpts,
}
}
@@ -700,7 +700,7 @@ func toStringSliceInternal(command composegotypes.ShellCommand) []string {
if len(command) == 0 {
return nil
}
- return []string(command)
+ return command
}
func convertDurationPtrInternal(duration *composegotypes.Duration) *time.Duration {
diff --git a/backend/pkg/libarcane/swarm/resources.go b/backend/pkg/libarcane/swarm/resources.go
index 9ae0e9acf..640881dfd 100644
--- a/backend/pkg/libarcane/swarm/resources.go
+++ b/backend/pkg/libarcane/swarm/resources.go
@@ -96,7 +96,7 @@ func planManagedFileResourcesInternal(
Labels: resource.Labels,
IsExternal: bool(resource.External),
}
- if bool(resource.External) {
+ if resource.External {
result[key] = plan
continue
}
@@ -126,7 +126,7 @@ func ensureSwarmNetworksInternal(ctx context.Context, dockerClient *dockerclient
cfg := project.Networks[key]
networkName := result[key]
- if bool(cfg.External) {
+ if cfg.External {
if networkName == "bridge" || networkName == "host" || networkName == "none" {
continue
}
diff --git a/backend/pkg/pagination/skipcount_test.go b/backend/pkg/pagination/skipcount_test.go
index e7c1166a0..3893f6a4d 100644
--- a/backend/pkg/pagination/skipcount_test.go
+++ b/backend/pkg/pagination/skipcount_test.go
@@ -31,7 +31,7 @@ func TestPaginateAndSortDB_SkipCountReturnsUnknownTotals(t *testing.T) {
var got []widget
resp, err := PaginateAndSortDB(QueryParams{
Params: Params{Start: 0, Limit: 2, SkipCount: true},
- SortParams: SortParams{Sort: "Name", Order: SortOrder("asc")},
+ SortParams: SortParams{Sort: "Name", Order: "asc"},
}, db.Model(&widget{}), &got)
require.NoError(t, err)
require.Len(t, got, 2)
@@ -47,7 +47,7 @@ func TestPaginateAndSortDB_DefaultStillCounts(t *testing.T) {
var got []widget
resp, err := PaginateAndSortDB(QueryParams{
Params: Params{Start: 0, Limit: 2},
- SortParams: SortParams{Sort: "Name", Order: SortOrder("asc")},
+ SortParams: SortParams{Sort: "Name", Order: "asc"},
}, db.Model(&widget{}), &got)
require.NoError(t, err)
require.Len(t, got, 2)
@@ -61,7 +61,7 @@ func TestPaginateAndSortDB_SkipCountShowAll(t *testing.T) {
var got []widget
resp, err := PaginateAndSortDB(QueryParams{
Params: Params{Start: 0, Limit: -1, SkipCount: true},
- SortParams: SortParams{Sort: "Name", Order: SortOrder("asc")},
+ SortParams: SortParams{Sort: "Name", Order: "asc"},
}, db.Model(&widget{}), &got)
require.NoError(t, err)
require.Len(t, got, 5)
diff --git a/backend/pkg/utils/notifications/deliver_test.go b/backend/pkg/utils/notifications/deliver_test.go
index 051d8a0b6..66599c7b1 100644
--- a/backend/pkg/utils/notifications/deliver_test.go
+++ b/backend/pkg/utils/notifications/deliver_test.go
@@ -10,7 +10,7 @@ import (
)
func TestDeliver_UnknownProviderIsNotHandled(t *testing.T) {
- handled, err := Deliver(context.Background(), models.NotificationProvider("bogus"), models.JSON{}, Content{})
+ handled, err := Deliver(context.Background(), "bogus", models.JSON{}, Content{})
require.False(t, handled)
require.NoError(t, err)
}
diff --git a/backend/pkg/utils/notifications/messages.go b/backend/pkg/utils/notifications/messages.go
index 36cca4ca1..5fc5b3382 100644
--- a/backend/pkg/utils/notifications/messages.go
+++ b/backend/pkg/utils/notifications/messages.go
@@ -71,17 +71,17 @@ func BuildImageUpdateNotificationMessage(format MessageFormat, environmentName,
}
var message strings.Builder
- message.WriteString(fmt.Sprintf("%s\n\n", formatNotificationTitleInternal(format, "πŸ”” Container Image Update Notification")))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Image"), imageRef))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Status"), updateStatus))
+ fmt.Fprintf(&message, "%s\n\n", formatNotificationTitleInternal(format, "πŸ”” Container Image Update Notification"))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName)
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Image"), imageRef)
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Status"), updateStatus)
if updateInfo != nil {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Update Type"), updateInfo.UpdateType))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Update Type"), updateInfo.UpdateType)
if updateInfo.CurrentDigest != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Current Digest"), formatNotificationCodeInternal(format, updateInfo.CurrentDigest)))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Current Digest"), formatNotificationCodeInternal(format, updateInfo.CurrentDigest))
}
if updateInfo.LatestDigest != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Latest Digest"), formatNotificationCodeInternal(format, updateInfo.LatestDigest)))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Latest Digest"), formatNotificationCodeInternal(format, updateInfo.LatestDigest))
}
}
@@ -95,17 +95,17 @@ func BuildContainerUpdateNotificationMessage(format MessageFormat, environmentNa
}
var message strings.Builder
- message.WriteString(fmt.Sprintf("%s\n\n", formatNotificationTitleInternal(format, "βœ… Container Successfully Updated")))
- message.WriteString("Your container has been updated with the latest image version.\n\n")
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Container"), containerName))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Image"), imageRef))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Status"), status))
+ fmt.Fprintf(&message, "%s\n\n", formatNotificationTitleInternal(format, "βœ… Container Successfully Updated"))
+ fmt.Fprintf(&message, "Your container has been updated with the latest image version.\n\n")
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName)
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Container"), containerName)
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Image"), imageRef)
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Status"), status)
if oldDigest != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Previous Version"), formatNotificationCodeInternal(format, oldDigest)))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Previous Version"), formatNotificationCodeInternal(format, oldDigest))
}
if newDigest != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Current Version"), formatNotificationCodeInternal(format, newDigest)))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Current Version"), formatNotificationCodeInternal(format, newDigest))
}
return message.String()
@@ -125,32 +125,32 @@ func BuildBatchImageUpdateNotificationMessage(format MessageFormat, environmentN
sort.Strings(imageRefs)
var message strings.Builder
- message.WriteString(fmt.Sprintf("%s\n\n%s\n", formatNotificationTitleInternal(format, title), description))
- message.WriteString(fmt.Sprintf("%s %s\n\n", formatNotificationLabelInternal(format, "Environment"), environmentName))
+ fmt.Fprintf(&message, "%s\n\n%s\n", formatNotificationTitleInternal(format, title), description)
+ fmt.Fprintf(&message, "%s %s\n\n", formatNotificationLabelInternal(format, "Environment"), environmentName)
for _, imageRef := range imageRefs {
update := updates[imageRef]
switch format {
case MessageFormatPlain:
- message.WriteString(fmt.Sprintf("%s\n", imageRef))
- message.WriteString(fmt.Sprintf("β€’ Type: %s\n", update.UpdateType))
- message.WriteString(fmt.Sprintf("β€’ Current: %s\n", update.CurrentDigest))
- message.WriteString(fmt.Sprintf("β€’ Latest: %s\n\n", update.LatestDigest))
+ fmt.Fprintf(&message, "%s\n", imageRef)
+ fmt.Fprintf(&message, "β€’ Type: %s\n", update.UpdateType)
+ fmt.Fprintf(&message, "β€’ Current: %s\n", update.CurrentDigest)
+ fmt.Fprintf(&message, "β€’ Latest: %s\n\n", update.LatestDigest)
case MessageFormatMarkdown:
- message.WriteString(fmt.Sprintf("**%s**\n", imageRef))
- message.WriteString(fmt.Sprintf("β€’ **Type:** %s\n", update.UpdateType))
- message.WriteString(fmt.Sprintf("β€’ **Current:** %s\n", formatNotificationCodeInternal(format, update.CurrentDigest)))
- message.WriteString(fmt.Sprintf("β€’ **Latest:** %s\n\n", formatNotificationCodeInternal(format, update.LatestDigest)))
+ fmt.Fprintf(&message, "**%s**\n", imageRef)
+ fmt.Fprintf(&message, "β€’ **Type:** %s\n", update.UpdateType)
+ fmt.Fprintf(&message, "β€’ **Current:** %s\n", formatNotificationCodeInternal(format, update.CurrentDigest))
+ fmt.Fprintf(&message, "β€’ **Latest:** %s\n\n", formatNotificationCodeInternal(format, update.LatestDigest))
case MessageFormatSlack:
- message.WriteString(fmt.Sprintf("*%s*\n", imageRef))
- message.WriteString(fmt.Sprintf("β€’ *Type:* %s\n", update.UpdateType))
- message.WriteString(fmt.Sprintf("β€’ *Current:* %s\n", formatNotificationCodeInternal(format, update.CurrentDigest)))
- message.WriteString(fmt.Sprintf("β€’ *Latest:* %s\n\n", formatNotificationCodeInternal(format, update.LatestDigest)))
+ fmt.Fprintf(&message, "*%s*\n", imageRef)
+ fmt.Fprintf(&message, "β€’ *Type:* %s\n", update.UpdateType)
+ fmt.Fprintf(&message, "β€’ *Current:* %s\n", formatNotificationCodeInternal(format, update.CurrentDigest))
+ fmt.Fprintf(&message, "β€’ *Latest:* %s\n\n", formatNotificationCodeInternal(format, update.LatestDigest))
case MessageFormatHTML:
- message.WriteString(fmt.Sprintf("<b>%s</b>\n", imageRef))
- message.WriteString(fmt.Sprintf("β€’ <b>Type:</b> %s\n", update.UpdateType))
- message.WriteString(fmt.Sprintf("β€’ <b>Current:</b> %s\n", formatNotificationCodeInternal(format, update.CurrentDigest)))
- message.WriteString(fmt.Sprintf("β€’ <b>Latest:</b> %s\n\n", formatNotificationCodeInternal(format, update.LatestDigest)))
+ fmt.Fprintf(&message, "<b>%s</b>\n", imageRef)
+ fmt.Fprintf(&message, "β€’ <b>Type:</b> %s\n", update.UpdateType)
+ fmt.Fprintf(&message, "β€’ <b>Current:</b> %s\n", formatNotificationCodeInternal(format, update.CurrentDigest))
+ fmt.Fprintf(&message, "β€’ <b>Latest:</b> %s\n\n", formatNotificationCodeInternal(format, update.LatestDigest))
}
}
@@ -159,23 +159,23 @@ func BuildBatchImageUpdateNotificationMessage(format MessageFormat, environmentN
func BuildVulnerabilitySummaryNotificationMessage(format MessageFormat, environmentName, summaryLabel, overview, fixableCount, severityBreakdown, sampleCVEs string) string {
var message strings.Builder
- message.WriteString(fmt.Sprintf("%s\n\n", formatNotificationTitleInternal(format, "πŸ“Š Daily Vulnerability Summary")))
+ fmt.Fprintf(&message, "%s\n\n", formatNotificationTitleInternal(format, "πŸ“Š Daily Vulnerability Summary"))
if strings.TrimSpace(summaryLabel) != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Summary"), summaryLabel))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Summary"), summaryLabel)
}
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName)
if strings.TrimSpace(overview) != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Overview"), overview))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Overview"), overview)
}
if strings.TrimSpace(fixableCount) != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Fixable Vulnerabilities"), fixableCount))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Fixable Vulnerabilities"), fixableCount)
}
if strings.TrimSpace(severityBreakdown) != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Severity Breakdown"), severityBreakdown))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Severity Breakdown"), severityBreakdown)
}
if strings.TrimSpace(sampleCVEs) != "" {
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Sample CVEs"), sampleCVEs))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Sample CVEs"), sampleCVEs)
}
return message.String()
@@ -183,23 +183,23 @@ func BuildVulnerabilitySummaryNotificationMessage(format MessageFormat, environm
func BuildPruneReportNotificationMessage(format MessageFormat, environmentName string, result *system.PruneAllResult) string {
var message strings.Builder
- message.WriteString(fmt.Sprintf("%s\n\n", formatNotificationTitleInternal(format, "🧹 System Prune Report")))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName))
- message.WriteString(fmt.Sprintf("%s %s\n\n", formatNotificationLabelInternal(format, "Total Space Reclaimed"), FormatBytes(result.SpaceReclaimed)))
- message.WriteString(fmt.Sprintf("%s\n", formatNotificationLabelInternal(format, "Breakdown")))
- message.WriteString(fmt.Sprintf("- Containers: %s\n", FormatBytes(result.ContainerSpaceReclaimed)))
- message.WriteString(fmt.Sprintf("- Images: %s\n", FormatBytes(result.ImageSpaceReclaimed)))
- message.WriteString(fmt.Sprintf("- Volumes: %s\n", FormatBytes(result.VolumeSpaceReclaimed)))
- message.WriteString(fmt.Sprintf("- Build Cache: %s\n", FormatBytes(result.BuildCacheSpaceReclaimed)))
+ fmt.Fprintf(&message, "%s\n\n", formatNotificationTitleInternal(format, "🧹 System Prune Report"))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName)
+ fmt.Fprintf(&message, "%s %s\n\n", formatNotificationLabelInternal(format, "Total Space Reclaimed"), FormatBytes(result.SpaceReclaimed))
+ fmt.Fprintf(&message, "%s\n", formatNotificationLabelInternal(format, "Breakdown"))
+ fmt.Fprintf(&message, "- Containers: %s\n", FormatBytes(result.ContainerSpaceReclaimed))
+ fmt.Fprintf(&message, "- Images: %s\n", FormatBytes(result.ImageSpaceReclaimed))
+ fmt.Fprintf(&message, "- Volumes: %s\n", FormatBytes(result.VolumeSpaceReclaimed))
+ fmt.Fprintf(&message, "- Build Cache: %s\n", FormatBytes(result.BuildCacheSpaceReclaimed))
return message.String()
}
func BuildAutoHealNotificationMessage(format MessageFormat, environmentName, containerName string) string {
var message strings.Builder
- message.WriteString(fmt.Sprintf("%s\n\n", formatNotificationTitleInternal(format, "Auto Heal")))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName))
- message.WriteString(fmt.Sprintf("%s %s\n", formatNotificationLabelInternal(format, "Container"), containerName))
- message.WriteString(fmt.Sprintf("%s Automatically restarted because it was unhealthy.\n", formatNotificationLabelInternal(format, "Status")))
+ fmt.Fprintf(&message, "%s\n\n", formatNotificationTitleInternal(format, "Auto Heal"))
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName)
+ fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Container"), containerName)
+ fmt.Fprintf(&message, "%s Automatically restarted because it was unhealthy.\n", formatNotificationLabelInternal(format, "Status"))
return message.String()
}
diff --git a/cli/internal/output/tui.go b/cli/internal/output/tui.go
index 5d514c566..9b49a3341 100644
--- a/cli/internal/output/tui.go
+++ b/cli/internal/output/tui.go
@@ -60,13 +60,13 @@ func StartSpinner(label string) *Spinner {
program := tea.NewProgram(model)
done := make(chan struct{})
- spinner := &Spinner{program: program, done: done}
+ spin := &Spinner{program: program, done: done}
go func() {
_, _ = program.Run()
close(done)
}()
- return spinner
+ return spin
}
// Stop stops the spinner and moves to the next line.
diff --git a/cli/pkg/admin/users/cmd.go b/cli/pkg/admin/users/cmd.go
index 681d77a9e..664c71036 100644
--- a/cli/pkg/admin/users/cmd.go
+++ b/cli/pkg/admin/users/cmd.go
@@ -60,7 +60,7 @@ func summarizeRoleAssignments(assignments []user.RoleAssignmentSummary) string {
hasGlobal bool
}
buckets := map[string]*bucket{}
- order := []string{}
+ var order []string
for _, a := range assignments {
b, ok := buckets[a.RoleID]
if !ok {