chore(deps): downgrade golangci-lint to 1.57.1, update golangci-lint …

…settings, and fix lint errors This change will downgrade the version of golangci-lint to 1.57.1, because there is currently a bug within 1.57.2 mentioned here golangci/golangci-lint#4606 Signed-off-by: Casale, Robert <[email protected]>
fidelity · May 1, 2024 · d249eaf · d249eaf
1 parent d8da315
commit d249eaf
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 22 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -24,7 +24,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.57
+          version: v1.57.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,19 +1,19 @@
 run:
     timeout: 10m
     tests: false
-    skip-dirs:
-    - third_party/*
-    - pkg/azure/wstrust
-    skip-files:
-    - "zz_generated.*\\.go$"
-    - ".*_mock\\.go"
 
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0
   exclude-rules:
     - linters: [golint]
       text: "should not use dot imports|don't use an underscore in package name"
+  exclude-dirs:
+    - third_party/*
+    - pkg/azure/wstrust
+  exclude-files:
+    - "zz_generated.*\\.go$"
+    - ".*_mock\\.go"
 
 linters-settings:
   gomoddirectives:
@@ -51,3 +51,4 @@ linters:
     - nosnakecase # deprecated by the owner
     - interfacebloat
     - forcetypeassert # maybe enable in the future
+    - depguard # maybe enable in the future
diff --git a/pkg/flags/unmarshal.go b/pkg/flags/unmarshal.go
@@ -92,7 +92,7 @@ func (b *flagBinder) Unmarshal(flagset *pflag.FlagSet, out interface{}) error {
 
 	// Loop through the struct fields and see if there
 	// is a matching flag
-	for i := 0; i < val.NumField(); i++ {
+	for i := range val.NumField() {
 		field := t.Field(i)
 
 		fieldV := val.Field(i)

diff --git a/pkg/history/filter.go b/pkg/history/filter.go
@@ -66,9 +66,8 @@ func FilterHistoryWithFuncs(list *historyv1alpha.HistoryEntryList, filterSpec *F
 
 	entries := []historyv1alpha.HistoryEntry{}
 	for _, entry := range list.Items {
-		entryToFilter := entry
-		if FilterEntry(&entryToFilter, filterSpec, filterFucs) {
-			entries = append(entries, entryToFilter)
+		if FilterEntry(&entry, filterSpec, filterFucs) {
+			entries = append(entries, entry)
 		}
 	}
 	list.Items = entries

diff --git a/pkg/history/store.go b/pkg/history/store.go
@@ -243,9 +243,8 @@ func (s *storeImpl) filterHistory(filter func(entry *historyv1alpha.HistoryEntry
 
 	filteredEntries := []*historyv1alpha.HistoryEntry{}
 	for _, entry := range historyList.Items {
-		filterEntry := entry
-		if filter(&filterEntry) {
-			filteredEntries = append(filteredEntries, &filterEntry)
+		if filter(&entry) {
+			filteredEntries = append(filteredEntries, &entry)
 		}
 	}
 

diff --git a/pkg/plugins/identity/azure/aad/aad.go b/pkg/plugins/identity/azure/aad/aad.go
@@ -84,7 +84,7 @@ type aadConfig struct {
 
 	TenantID string           `json:"tenant-id" validate:"required"`
 	ClientID string           `json:"client-id" validate:"required"`
-	AADHost  identity.AADHost `json:"aad-host" validate:"required"`
+	AADHost  identity.AADHost `json:"aad-host"  validate:"required"`
 }
 
 func (p *aadIdentityProvider) Name() string {

diff --git a/pkg/plugins/identity/saml/sp/aws/provider.go b/pkg/plugins/identity/saml/sp/aws/provider.go
@@ -58,7 +58,7 @@ type awsProviderConfig struct {
 	sp.ProviderConfig
 
 	Partition string `json:"partition" validate:"required"`
-	Region    string `json:"region" validate:"required"`
+	Region    string `json:"region"    validate:"required"`
 }
 
 func NewServiceProvider(itemSelector provider.SelectItemFunc) sp.ServiceProvider {

diff --git a/pkg/provider/common/common.go b/pkg/provider/common/common.go
@@ -36,8 +36,8 @@ type ClusterProviderConfig struct {
 // IdentityProviderConfig represents the base configuration for an
 // identity provider.
 type IdentityProviderConfig struct {
-	Username    string `json:"username" validate:"required"`
-	Password    string `json:"password" validate:"required"`
+	Username    string `json:"username"     validate:"required"`
+	Password    string `json:"password"     validate:"required"`
 	IdpProtocol string `json:"idp-protocol" validate:"required"`
 }
 

diff --git a/pkg/provider/registry/registry.go b/pkg/provider/registry/registry.go
@@ -129,8 +129,7 @@ func ListDiscoveryPluginRegistrations() []*DiscoveryPluginRegistration {
 
 	plugins := []*DiscoveryPluginRegistration{}
 	for _, registration := range discoveryPlugins {
-		pluginRegistration := registration
-		plugins = append(plugins, pluginRegistration)
+		plugins = append(plugins, registration)
 	}
 
 	return plugins
@@ -142,8 +141,7 @@ func ListIdentityPluginRegistrations() []*IdentityPluginRegistration {
 
 	plugins := []*IdentityPluginRegistration{}
 	for _, registration := range identityPlugins {
-		pluginRegistration := registration
-		plugins = append(plugins, pluginRegistration)
+		plugins = append(plugins, registration)
 	}
 
 	return plugins