marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(lint): enable sloppyReassign rule from go-critic (#23443)

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-06-17 17:46:50 +02:00
committed by GitHub
parent 127293dcc7
commit fa25f278c0
9 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yaml
View File

@@ -64,7 +64,6 @@ linters:
- importShadow
- paramTypeCombine # Leave disabled, there are too many failures to be worth fixing.
- rangeValCopy
- sloppyReassign
- tooManyResultsChecker
- unnamedResult
- whyNoLint

3
cmpserver/plugin/config.go
View File

@@ -74,7 +74,8 @@ func ReadPluginConfig(filePath string) (*PluginConfig, error) {
return nil, err
}
if err = ValidatePluginConfig(config); err != nil {
err = ValidatePluginConfig(config)
if err != nil {
return nil, err
}

6
server/application/application.go
View File

@@ -1067,7 +1067,8 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque
return nil, err
}
if err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplications, rbac.ActionUpdate, app.RBACName(s.ns)); err != nil {
err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplications, rbac.ActionUpdate, app.RBACName(s.ns))
if err != nil {
return nil, err
}
@@ -2455,7 +2456,8 @@ func (s *Server) getUnstructuredLiveResourceOrApp(ctx context.Context, rbacReque
if err != nil {
return nil, nil, nil, nil, err
}
if err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplications, rbacRequest, app.RBACName(s.ns)); err != nil {
err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplications, rbacRequest, app.RBACName(s.ns))
if err != nil {
return nil, nil, nil, nil, err
}
config, err = s.getApplicationClusterConfig(ctx, app)

9
server/applicationset/applicationset.go
View File

@@ -122,7 +122,8 @@ func (s *Server) Get(ctx context.Context, q *applicationset.ApplicationSetGetQue
if err != nil {
return nil, fmt.Errorf("error getting ApplicationSet: %w", err)
}
if err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplicationSets, rbac.ActionGet, a.RBACName(s.ns)); err != nil {
err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplicationSets, rbac.ActionGet, a.RBACName(s.ns))
if err != nil {
return nil, err
}
@@ -248,7 +249,8 @@ func (s *Server) Create(ctx context.Context, q *applicationset.ApplicationSetCre
if !q.Upsert {
return nil, status.Errorf(codes.InvalidArgument, "existing ApplicationSet spec is different, use upsert flag to force update")
}
if err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplicationSets, rbac.ActionUpdate, appset.RBACName(s.ns)); err != nil {
err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplicationSets, rbac.ActionUpdate, appset.RBACName(s.ns))
if err != nil {
return nil, err
}
updated, err := s.updateAppSet(ctx, existing, appset, true)
@@ -347,7 +349,8 @@ func (s *Server) ResourceTree(ctx context.Context, q *applicationset.Application
if err != nil {
return nil, fmt.Errorf("error getting ApplicationSet: %w", err)
}
if err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplicationSets, rbac.ActionGet, a.RBACName(s.ns)); err != nil {
err = s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplicationSets, rbac.ActionGet, a.RBACName(s.ns))
if err != nil {
return nil, err
}

3
util/argo/normalizers/knowntypes_normalizer.go
View File

@@ -102,7 +102,8 @@ func normalize(obj map[string]any, field knownTypeField, fieldPath []string) err
}
items[j] = newItem
} else {
if err = normalize(item, field, subPath); err != nil {
err = normalize(item, field, subPath)
if err != nil {
return err
}
}

3
util/cache/appstate/cache.go vendored
View File

@@ -88,7 +88,8 @@ func (c *Cache) GetAppResourcesTree(appName string, res *appv1.ApplicationTree)
if res.ShardsCount > 1 {
for i := int64(1); i < res.ShardsCount; i++ {
var shard appv1.ApplicationTree
if err = c.GetItem(appResourcesTreeKey(appName, i), &shard); err != nil {
err = c.GetItem(appResourcesTreeKey(appName, i), &shard)
if err != nil {
return err
}
res.Merge(&shard)

3
util/db/cluster.go
View File

@@ -112,7 +112,8 @@ func (db *db) CreateCluster(ctx context.Context, c *appv1.Cluster) (*appv1.Clust
},
}
if err = clusterToSecret(c, clusterSecret); err != nil {
err = clusterToSecret(c, clusterSecret)
if err != nil {
return nil, err
}

3
util/db/repository.go
View File

@@ -180,7 +180,8 @@ func (db *db) listRepositories(ctx context.Context, repoType *string, writeCreds
if err != nil {
return nil, err
}
if err = db.enrichCredsToRepos(ctx, repositories); err != nil {
err = db.enrichCredsToRepos(ctx, repositories)
if err != nil {
return nil, err
}

3
util/oci/client.go
View File

@@ -434,7 +434,8 @@ func saveCompressedImageToPath(ctx context.Context, digest string, repo oras.Rea
}
// Remove redundant ingest folder; this is an artifact from the oras.Copy call above
if err = os.RemoveAll(path.Join(tempDir, "ingest")); err != nil {
err = os.RemoveAll(path.Join(tempDir, "ingest"))
if err != nil {
return err
}