Update golangci-lint to v1.60.3

elastic · Aug 28, 2024 · d1f9141 · d1f9141
1 parent 44d6701
commit d1f9141
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -55,4 +55,4 @@ $(GOBIN)/go-licence-detector:
 	@ go install go.elastic.co/[email protected]
 
 $(GOBIN)/golangci-lint:
-	@ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
+	@ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.3
diff --git a/cmd/main.go b/cmd/main.go
@@ -34,7 +34,7 @@ func main() {
 		Long:    "Dump ECK and Kubernetes data for support and troubleshooting purposes.",
 		PreRunE: preRunOperations,
 		Version: internal.Version(),
-		RunE: func(_ *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			return internal.Run(diagParams)
 		},
 	}

diff --git a/internal/diag.go b/internal/diag.go
@@ -129,7 +129,7 @@ func Run(params Params) error {
 		operatorVersions = append(operatorVersions, detectECKVersion(clientSet, ns, params.ECKVersion))
 	}
 
-	maxOperatorVersion := max(operatorVersions)
+	maxOperatorVersion := maxVersion(operatorVersions)
 	logVersion(maxOperatorVersion)
 
 	allNamespaces := sets.New(params.ResourcesNamespaces...)

diff --git a/internal/version.go b/internal/version.go
@@ -99,7 +99,7 @@ func extractVersionFromContainers(containers []corev1.Container) *version.Versio
 		if strings.Contains(container.Image, "eck-operator") {
 			parsed, err := extractVersionFromDockerImage(container.Image)
 			if err != nil {
-				logger.Printf(err.Error())
+				logger.Print(err.Error())
 				return fallbackMaxVersion
 			}
 			return parsed
@@ -142,8 +142,8 @@ func extractVersionFromDockerImage(image string) (*version.Version, error) {
 	return fallbackMaxVersion, nil
 }
 
-// max returns the maximum of the given versions.
-func max(versions []*version.Version) *version.Version {
+// maxVersion returns the maximum of the given versions.
+func maxVersion(versions []*version.Version) *version.Version {
 	if len(versions) == 0 {
 		return fallbackMaxVersion
 	}

diff --git a/internal/version_test.go b/internal/version_test.go
@@ -50,7 +50,7 @@ func Test_min(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := max(tt.args.versions); !reflect.DeepEqual(got, tt.want) {
+			if got := maxVersion(tt.args.versions); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("max() = %v, want %v", got, tt.want)
 			}
 		})