diff --git a/.golangci.yaml b/.golangci.yaml index 38783894c5..f8e0d36646 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -15,6 +15,7 @@ issues: linters: enable: + - exptostd - errorlint - gocritic - gomodguard diff --git a/applicationset/services/scm_provider/aws_codecommit.go b/applicationset/services/scm_provider/aws_codecommit.go index 481645454a..6c5f106573 100644 --- a/applicationset/services/scm_provider/aws_codecommit.go +++ b/applicationset/services/scm_provider/aws_codecommit.go @@ -4,22 +4,21 @@ import ( "context" "errors" "fmt" + "maps" pathpkg "path" "path/filepath" + "slices" "strings" - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/credentials/stscreds" + "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/codecommit" "github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi" log "github.com/sirupsen/logrus" - "golang.org/x/exp/maps" - "k8s.io/utils/strings/slices" application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" ) @@ -299,7 +298,7 @@ func (p *AWSCodeCommitProvider) getTagFilters() []*resourcegroupstaggingapi.TagF filter.Values = append(filter.Values, aws.String(tagFilter.Value)) } } - return maps.Values(filters) + return slices.Collect(maps.Values(filters)) } func getCodeCommitRepoName(repoArn string) (string, error) { diff --git a/go.mod b/go.mod index 01bf68b7db..f62bdf7657 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,6 @@ require ( go.opentelemetry.io/otel/sdk v1.36.0 go.uber.org/automaxprocs v1.6.0 golang.org/x/crypto v0.38.0 - golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f golang.org/x/net v0.40.0 golang.org/x/oauth2 v0.30.0 golang.org/x/sync v0.14.0 diff --git a/go.sum b/go.sum index ba4736a4a6..30b0432a3a 100644 --- a/go.sum +++ b/go.sum @@ -892,8 +892,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= -golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=