Fix golangci-lint 1.54 breaking changes (#1216)

Related to https://github.com/GaijinEntertainment/go-exhaustruct/releases/tag/v3.0.0
elastic · Aug 10, 2023 · 1ef7fa9 · 1ef7fa9
1 parent 14b4ffd
commit 1ef7fa9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -61,5 +61,7 @@ linters-settings:
     exclude:
       - '.*cloudbeat.*fetching.fetchers.k8s.FileCommonData'
       - '.*cloudbeat.*fetching.fetchers.k8s.ProcCommonData'
+      - '.*cloudbeat.*fetching.fetchers.*<anonymous>'
+      - '.*cloudbeat.*flavors.benchmark.*<anonymous>'
   tenv:
     all: true
diff --git a/bin/.golangci-lint-1.53.3.pkg → bin/.golangci-lint-1.54.0.pkg b/bin/.golangci-lint-1.53.3.pkg → bin/.golangci-lint-1.54.0.pkg
diff --git a/bin/golangci-lint b/bin/golangci-lint
@@ -1 +1 @@
-.golangci-lint-1.53.3.pkg
+.golangci-lint-1.54.0.pkg
diff --git a/resources/fetching/factory/k8s_factory.go b/resources/fetching/factory/k8s_factory.go
@@ -44,10 +44,10 @@ var vanillaFsPatterns = []string{
 }
 
 var vanillaRequiredProcesses = fetchers.ProcessesConfigMap{
-	"etcd":            {},
-	"kube-apiserver":  {},
-	"kube-controller": {},
-	"kube-scheduler":  {},
+	"etcd":            {ConfigFileArguments: nil},
+	"kube-apiserver":  {ConfigFileArguments: nil},
+	"kube-controller": {ConfigFileArguments: nil},
+	"kube-scheduler":  {ConfigFileArguments: nil},
 	"kubelet":         {ConfigFileArguments: []string{"config"}},
 }
 

diff --git a/resources/fetching/fetchers/aws/rds_fetcher_test.go b/resources/fetching/fetchers/aws/rds_fetcher_test.go
@@ -75,7 +75,13 @@ func (s *RdsFetcherTestSuite) TestFetcher_Fetch() {
 			rdsMocksReturnVals: rdsMocksReturnVals{
 				"DescribeDBInstances": {[]awslib.AwsResource{dbInstance1, dbInstance2}, nil},
 			},
-			expected: []fetching.ResourceInfo{{Resource: RdsResource{dbInstance: dbInstance1}}, {Resource: RdsResource{dbInstance: dbInstance2}}},
+			expected: []fetching.ResourceInfo{{
+				Resource:      RdsResource{dbInstance: dbInstance1},
+				CycleMetadata: fetching.CycleMetadata{},
+			}, {
+				Resource:      RdsResource{dbInstance: dbInstance2},
+				CycleMetadata: fetching.CycleMetadata{},
+			}},
 		},
 	}