Update lint tools and fix lint errors

Signed-off-by: Caleb Xu <caxu@redhat.com>

Author: caxu-rh

Makefile

@@ -34,17 +34,13 @@ lint: golangci-lint ## Run golangci-lint linter checks.
 	$(GOLANGCI_LINT) run
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.52.2
+GOLANGCI_LINT_VERSION ?= v2.1.6
 golangci-lint: $(GOLANGCI_LINT)
 $(GOLANGCI_LINT):
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION))
+	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION))
 
 GOFUMPT = $(shell pwd)/bin/gofumpt
-# TODO(komish): 
-# gofumpt pinned to 0.6.0 which is the last version to support a min go
-# version of 1.20. When our min go version in go.mod is updated, we can bump
-# this back to latest.
-GOFUMPT_VERSION ?= v0.6.0
+GOFUMPT_VERSION ?= v0.8.0
 gofumpt: ## Download envtest-setup locally if necessary.
 	$(call go-install-tool,$(GOFUMPT),mvdan.cc/gofumpt@$(GOFUMPT_VERSION))
 
@@ -58,4 +54,4 @@ GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 endef
 
 bindir:
-	mkdir $(PROJECT_DIR)/bin 2>/dev/null || true
+	mkdir $(PROJECT_DIR)/bin 2>/dev/null || true

get_ocp_range.go

@@ -75,7 +75,7 @@ func init() {
 func GetOCPRange(kubeVersionRange string) (string, error) {
 	// Return an error if the provided range of Kubernetes versions contains unsupported operators.
 	if strings.Contains(kubeVersionRange, "||") {
-		return "", fmt.Errorf("Range %s contains unsupported operator ||", kubeVersionRange)
+		return "", fmt.Errorf("range %s contains unsupported operator ||", kubeVersionRange)
 	}
 
 	minOCPRange, _ := semver.NewVersion("9.9")
@@ -84,21 +84,21 @@ func GetOCPRange(kubeVersionRange string) (string, error) {
 	// Ensure that the provided range of Kubernetes versions is a valid SemVer constraint.
 	kubeVersionRangeConstraint, err := semver.NewConstraint(kubeVersionRange)
 	if err != nil {
-		return "", fmt.Errorf("Error converting %s to Constraint: %v", kubeVersionRange, err)
+		return "", fmt.Errorf("error converting %s to Constraint: %v", kubeVersionRange, err)
 	}
 
 	for kubeVersionString, OCPVersionString := range kubeOpenShiftVersionMap {
 		// Check which of the known Kubernetes versions validate the Constraint.
 		kubeVersionObj, err := semver.NewVersion(kubeVersionString)
 		if err != nil {
-			return "", fmt.Errorf("Error converting %s to Version: %v", kubeVersionString, err)
+			return "", fmt.Errorf("error converting %s to Version: %v", kubeVersionString, err)
 		}
 		isInRange, _ := kubeVersionRangeConstraint.Validate(kubeVersionObj)
 		if isInRange {
 			// Register the corresponding minimum and maximum OCP versions.
 			OCPVersionObj, err := semver.NewVersion(OCPVersionString)
 			if err != nil {
-				return "", fmt.Errorf("Error converting %s to Version: %v", OCPVersionString, err)
+				return "", fmt.Errorf("error converting %s to Version: %v", OCPVersionString, err)
 			}
 			if OCPVersionObj.LessThan(minOCPRange) {
 				minOCPRange = OCPVersionObj
@@ -112,7 +112,7 @@ func GetOCPRange(kubeVersionRange string) (string, error) {
 	// Build the resulting range of OCP versions.
 	if minOCPRange.Original() == "9.9" {
 		// If the minimum was never set, it means we didn't match any known Kubernetes version.
-		return "", fmt.Errorf("Failed to match any known Kubernetes version to the provided range %s", kubeVersionRange)
+		return "", fmt.Errorf("failed to match any known Kubernetes version to the provided range %s", kubeVersionRange)
 	}
 	if isRangeOpenEnded(kubeVersionRangeConstraint) {
 		// If the provided range is open-ended, the result range should also be open-ended.