[8.x](backport #2705) [updatecli] Update hermit and pre-commit dependencies

.golangci.yaml

@@ -8,7 +8,7 @@ linters:
     - containedctx
     - contextcheck
     - exhaustruct
-    - exportloopref
+    - copyloopvar
     - fatcontext
     - gci
     - gocritic

.pre-commit-config.yaml

@@ -77,7 +77,7 @@ repos:
         files: deploy/cloudformation/.*yml
 
   - repo: https://github.com/aws-cloudformation/cfn-lint
-    rev: v1.18.3
+    rev: v1.18.4
     hooks:
       - id: cfn-python-lint
         files: deploy/cloudformation/.*.yml

bin/aws

@@ -1 +1 @@
-.awscli-2.19.1.pkg
+.awscli-2.19.4.pkg

bin/aws_completer

@@ -1 +1 @@
-.awscli-2.19.1.pkg
+.awscli-2.19.4.pkg

bin/bq

@@ -1 +1 @@
-.gcloud-499.0.0.pkg
+.gcloud-500.0.0.pkg

bin/docker-credential-gcloud

@@ -1 +1 @@
-.gcloud-499.0.0.pkg
+.gcloud-500.0.0.pkg

bin/gcloud

@@ -1 +1 @@
-.gcloud-499.0.0.pkg
+.gcloud-500.0.0.pkg

bin/gh

@@ -1 +1 @@
-.gh-2.60.1.pkg
+.gh-2.61.0.pkg

bin/git-credential-gcloud.sh

@@ -1 +1 @@
-.gcloud-499.0.0.pkg
+.gcloud-500.0.0.pkg

bin/golangci-lint

@@ -1 +1 @@
-.golangci-lint-1.61.0.pkg
+.golangci-lint-1.62.0.pkg

bin/gsutil

@@ -1 +1 @@
-.gcloud-499.0.0.pkg
+.gcloud-500.0.0.pkg

bin/kind

@@ -1 +1 @@
-.kind-0.24.0.pkg
+.kind-0.25.0.pkg

internal/flavors/benchmark/aws_org_test.go

@@ -103,7 +103,6 @@ func TestAWSOrg_Initialize(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

internal/flavors/benchmark/aws_test.go

@@ -62,7 +62,6 @@ func TestAWS_Initialize(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

internal/flavors/benchmark/azure.go

@@ -102,9 +102,9 @@ func calculateFetcherTimeout(period time.Duration) time.Duration {
 	roundedHours := math.Round(period.Hours() * 0.7)
 	to := time.Duration(roundedHours) * time.Hour
 
-	const min = 3 * time.Hour
-	if to < min {
-		return min
+	const minTimeout = 3 * time.Hour
+	if to < minTimeout {
+		return minTimeout
 	}
 
 	return to

internal/flavors/benchmark/azure_test.go

@@ -88,7 +88,6 @@ func TestAzure_Initialize(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tt := tt
 			t.Parallel()
 
 			testInitialize(t, &Azure{

internal/flavors/benchmark/eks_test.go

@@ -106,7 +106,6 @@ func TestEKS_Initialize(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

internal/flavors/benchmark/gcp_test.go

@@ -104,7 +104,6 @@ func TestGCP_Initialize(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tt := tt
 			t.Parallel()
 
 			testInitialize(t, &GCP{

internal/flavors/benchmark/k8s_test.go

@@ -58,7 +58,6 @@ func TestK8S_Initialize(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

internal/launcher/launcher_test.go

@@ -289,7 +289,6 @@ func (s *LauncherTestSuite) TestWaitForUpdates() {
 	}
 
 	for _, tt := range testcases {
-		tt := tt
 		s.Run(tt.name, func() {
 			mocks := s.initMocks()
 			sut := s.newLauncher(mocks, beaterMockCreator)

internal/resources/fetching/fetchers/azure/assets_enricher_keyvault_test.go

@@ -123,7 +123,6 @@ func TestKeyVaultEnricher(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			mockProvider := azurelib.NewMockProviderAPI(t)
 

internal/resources/fetching/fetchers/azure/assets_enricher_storage_account_test.go

@@ -377,7 +377,6 @@ func TestStorageAccountEnricher(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			cmd := cycle.Metadata{}
 

internal/resources/fetching/fetchers/azure/insights_batch_fetcher_test.go

@@ -184,7 +184,6 @@ func TestAzureInsightsBatchAssetFetcher(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			m := azurelib.NewMockProviderAPI(t)
 

internal/resources/fetching/fetchers/azure/locations_network_watcher_batch_fetcher_test.go

@@ -261,7 +261,6 @@ func TestAzureLocationsNetworkWatcherAssetBatchFetcher_Fetch(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			m := azurelib.NewMockProviderAPI(t)
 

internal/resources/fetching/fetchers/azure/security_fetcher_test.go

@@ -307,7 +307,6 @@ func TestAzureSecurityAssetFetcher(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			// tear up
 			m := azurelib.NewMockProviderAPI(t)

internal/resources/fetching/fetchers/k8s/process_fetcher_test.go

@@ -275,7 +275,6 @@ func TestExtractCommandName(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		name := strings.ReplaceAll(tc.cmd, "/", "|") // For readability, because tests are also hierarchical with '/'.
 		t.Run(name, func(t *testing.T) {
 			got := extractCommandName(tc.cmd)

internal/resources/providers/awslib/kms/provider_test.go

@@ -20,7 +20,6 @@ package kms
 import (
 	"context"
 	"errors"
-	"fmt"
 	"testing"
 
 	kmsClient "github.com/aws/aws-sdk-go-v2/service/kms"
@@ -35,8 +34,10 @@ import (
 type ProviderTestSuite struct {
 	suite.Suite
 }
-type mocks [2][]any
-type kmsClientMockReturnVals map[string][]mocks
+type (
+	mocks                   [2][]any
+	kmsClientMockReturnVals map[string][]mocks
+)
 
 func TestProviderTestSuite(t *testing.T) {
 	s := new(ProviderTestSuite)
@@ -47,11 +48,13 @@ func (s *ProviderTestSuite) SetupTest() {}
 
 func (s *ProviderTestSuite) TearDownTest() {}
 
-var keyId1 = "21c0ba99-3a6c-4f72-8ef8-8118d4804710"
-var keyId2 = "21c0ba99-3a6c-4f72-8ef8-8118d4804711"
+var (
+	keyId1 = "21c0ba99-3a6c-4f72-8ef8-8118d4804710"
+	keyId2 = "21c0ba99-3a6c-4f72-8ef8-8118d4804711"
+)
 
 func (s *ProviderTestSuite) TestProvider_DescribeSymmetricKeys() {
-	var tests = []struct {
+	tests := []struct {
 		name                    string
 		regions                 []string
 		kmsClientMockReturnVals kmsClientMockReturnVals
@@ -181,7 +184,7 @@ func (s *ProviderTestSuite) TestProvider_DescribeSymmetricKeys() {
 
 		// Using `ElementsMatch` instead of the usual `Equals` since iterating over the regions map does not produce a
 		//	guaranteed order
-		s.ElementsMatch(test.expected, results, fmt.Sprintf("Test '%s' failed, elements do not match", test.name))
+		s.ElementsMatch(test.expected, results, "Test '%s' failed, elements do not match", test.name)
 	}
 }
 

internal/resources/providers/awslib/s3/provider_test.go

@@ -20,7 +20,6 @@ package s3
 import (
 	"context"
 	"errors"
-	"fmt"
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -39,9 +38,11 @@ import (
 type ProviderTestSuite struct {
 	suite.Suite
 }
-type mocks [2][]any
-type s3ClientMockReturnVals map[string][]mocks
-type s3ControlClientMockReturnVals map[string]mocks
+type (
+	mocks                         [2][]any
+	s3ClientMockReturnVals        map[string][]mocks
+	s3ControlClientMockReturnVals map[string]mocks
+)
 
 func TestProviderTestSuite(t *testing.T) {
 	s := new(ProviderTestSuite)
@@ -52,14 +53,16 @@ func (s *ProviderTestSuite) SetupTest() {}
 
 func (s *ProviderTestSuite) TearDownTest() {}
 
-var bucketName = "MyBucket"
-var secondBucketName = "MyAnotherBucket"
-var region types.BucketLocationConstraint = "eu-west-1"
-var bucketPolicy BucketPolicy = map[string]any{"foo": "bar"}
-var bucketPolicyString = "{\"foo\": \"bar\"}"
+var (
+	bucketName                                        = "MyBucket"
+	secondBucketName                                  = "MyAnotherBucket"
+	region             types.BucketLocationConstraint = "eu-west-1"
+	bucketPolicy       BucketPolicy                   = map[string]any{"foo": "bar"}
+	bucketPolicyString                                = "{\"foo\": \"bar\"}"
+)
 
 func (s *ProviderTestSuite) TestProvider_DescribeBuckets() {
-	var tests = []struct {
+	tests := []struct {
 		name                          string
 		regions                       []string
 		s3ClientMockReturnVals        s3ClientMockReturnVals
@@ -526,6 +529,6 @@ func (s *ProviderTestSuite) TestProvider_DescribeBuckets() {
 
 		// Using `ElementsMatch` instead of the usual `Equals` since iterating over the regions map does not produce a
 		//	guaranteed order
-		s.ElementsMatch(test.expected, results, fmt.Sprintf("Test '%s' failed, elements do not match", test.name))
+		s.ElementsMatch(test.expected, results, "Test '%s' failed, elements do not match", test.name)
 	}
 }

internal/resources/providers/azurelib/inventory/app_service_provider_test.go

@@ -139,7 +139,6 @@ func TestGetAppServiceAuthSettings(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			mockWrapper := &mockAzureAppServiceWrapper{}
 			mockWrapper.Test(t)
@@ -284,7 +283,6 @@ func TestGetAppServiceSiteConfig(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			mockWrapper := &mockAzureAppServiceWrapper{}
 			mockWrapper.Test(t)

internal/resources/providers/azurelib/inventory/keyvault_provider_test.go

@@ -169,7 +169,6 @@ func TestListKeyVaultDiagnosticSettings(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			mockWrapper := &mockAzureKeyVaultWrapper{}
 			mockWrapper.Test(t)
@@ -283,7 +282,6 @@ func TestListKeyVaultKeys(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			mockWrapper := &mockAzureKeyVaultWrapper{}
 			mockWrapper.Test(t)
@@ -403,7 +401,6 @@ func TestListKeyVaultSecrets(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			mockWrapper := &mockAzureKeyVaultWrapper{}
 			mockWrapper.Test(t)

internal/resources/providers/azurelib/inventory/resource_graph_provider_test.go

@@ -255,7 +255,6 @@ func TestReadPager(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			pagerHandlerMock := runtime.PagingHandler[int]{
 				More:    tc.moreFn,

internal/resources/providers/azurelib/inventory/security_provider_test.go

@@ -136,7 +136,6 @@ func TestListSecurityContacts(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			log := testhelper.NewLogger(t)
 
@@ -258,7 +257,6 @@ func TestListAutoProvisioningSettings(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			log := testhelper.NewLogger(t)
 

internal/resources/providers/azurelib/inventory/sql_server_provider_test.go

@@ -635,7 +635,6 @@ func TestListSQLFirewallRules(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			fakeSrv := &fake.FirewallRulesServer{}
 			fakeSrv.NewListByServerPager = func(_, _ string, _ *armsql.FirewallRulesClientListByServerOptions) azfake.PagerResponder[armsql.FirewallRulesClientListByServerResponse] {

internal/resources/providers/azurelib/inventory/storage_provider_test.go

@@ -94,7 +94,6 @@ func TestTransformStorageAccounts(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			got, err := transformStorageAccounts(tc.inputServicesPages, tc.inputSubscriptionId)
 			if tc.expectError {
@@ -152,7 +151,6 @@ func TestTransformBlobServices(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			got, err := transformBlobServices(tc.inputServicesPages, tc.inputStorageAccount)
 			if tc.expectError {
@@ -694,7 +692,6 @@ func TestListDiagnosticSettingsAssetTypes(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			provider := &storageAccountProvider{

internal/resources/utils/strings/strings_test.go

@@ -98,7 +98,6 @@ func TestFromMap(t *testing.T) {
 	}
 
 	for name, tc := range tests {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			got := FromMap(tc.input, tc.inputKey)
 			require.Equal(t, tc.expected, got)