conflict

Signed-off-by: Dani Louca <[email protected]>

Author: dloucasfx

.golangci.yml

@@ -58,9 +58,6 @@ linters:
           - unused
         path: pagefile.go # This exclusion is required for Windows only
         text: cachedBytes
-      - path: tools/
-        linters:
-          - gosec
 
     # Log a warning if an exclusion rule is unused.
     warn-unused: true
@@ -115,8 +112,6 @@ linters:
       enable-all: true
 
       settings:
-        shadow:
-          strict: true
         printf: # analyzer name, run `go tool vet help` to see all analyzers
           funcs: # run `go tool vet help printf` to see available settings for `printf` analyzer
             - Infof

Makefile

@@ -253,12 +253,6 @@ golint-all:
 .PHONY: gogci-all
 gogci-all:
 	@$(MAKE) for-all-target TARGET='gogci'
-	@$(MAKE) for-all gogci
-
-.PHONY: misspell
-misspell: $(TOOLS_BIN_DIR)/misspell
-	@echo "running $(MISSPELL)"
-	@$(MISSPELL) $$($(ALL_SRC_AND_DOC_CMD))
 
 .PHONY: update-matrix-versions
 update-matrix-versions: ## Update matrix, ex: K8s cluster versions used for testing. Set DEBUG=-debug to enable debug logs.

tools/k8s_versions/update_k8s_versions.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -23,11 +24,12 @@ import (
 var debug bool
 
 const (
-	EndOfLifeURL        string = "https://endoflife.date/api/kubernetes.json"
-	KindDockerHubURL    string = "https://hub.docker.com/v2/repositories/kindest/node/tags?page_size=1&page=1&ordering=last_updated&name="
-	MiniKubeURL         string = "https://raw.githubusercontent.com/kubernetes/minikube/master/pkg/minikube/constants/constants_kubernetes_versions.go"
-	KubeKindVersion     string = "k8s-kind-version"
-	KubeMinikubeVersion string = "k8s-minikube-version"
+	endOfLifeURL        string = "https://endoflife.date/api/kubernetes.json"
+	kindDockerHubURL    string = "https://hub.docker.com/v2/repositories/kindest/node/tags?page_size=1&page=1&ordering=last_updated&name="
+	miniKubeURL         string = "https://raw.githubusercontent.com/kubernetes/minikube/master/pkg/minikube/constants/constants_kubernetes_versions.go"
+	kubeKindVersion     string = "k8s-kind-version"
+	kubeMinikubeVersion string = "k8s-minikube-version"
+	ciMatrixPath        string = "ci-matrix.json"
 )
 
 type KubernetesVersion struct {
@@ -180,10 +182,10 @@ func updateMatrixFile(filePath string, kindVersions []string, minikubeVersions [
 	}
 
 	for _, value := range testMatrix {
-		if len(kindVersions) > 0 && value[KubeKindVersion] != nil {
-			value[KubeKindVersion] = kindVersions
-		} else if len(minikubeVersions) > 0 && value[KubeMinikubeVersion] != nil {
-			value[KubeMinikubeVersion] = minikubeVersions
+		if len(kindVersions) > 0 && value[kubeKindVersion] != nil {
+			value[kubeKindVersion] = kindVersions
+		} else if len(minikubeVersions) > 0 && value[kubeMinikubeVersion] != nil {
+			value[kubeMinikubeVersion] = minikubeVersions
 		}
 	}
 	// Marshal the updated test matrix back to JSON
@@ -215,8 +217,13 @@ func sortVersions(versions []string) {
 	})
 }
 
-func getRequestBody(url string) ([]byte, error) {
-	resp, err := http.Get(url)
+func getRequestBody(uRL string) ([]byte, error) {
+	u, err := url.Parse(uRL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid URL: %w", err)
+	}
+
+	resp, err := http.Get(u.String())
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch URL: %w", err)
 	}
@@ -246,40 +253,37 @@ func main() {
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
-	k8sVersions, err := getSupportedKubernetesVersions(EndOfLifeURL)
+	k8sVersions, err := getSupportedKubernetesVersions(endOfLifeURL)
 	if err != nil || len(k8sVersions) == 0 {
 		log.Fatalf("Failed to get k8s versions: %v", err)
 	}
-	logDebug("Found supported k8s versions %v", k8sVersions)
+	logDebug("Supported Kubernetes versions %v", k8sVersions)
 
-	kindVersions, err := getLatestSupportedKindImages(KindDockerHubURL, k8sVersions)
+	kindVersions, err := getLatestSupportedKindImages(kindDockerHubURL, k8sVersions)
 	if err != nil {
-		log.Printf("failed to get all kind versions: %v", err)
-	}
-	if len(kindVersions) > 0 {
-		// needs to be sorted so we don't end up with false positive diff in the json matrix file
-		sortVersions(kindVersions)
-		logDebug("Found supported kind images: %v", kindVersions)
+		log.Fatalf("Failed to get kind versions: %v", err)
 	}
 
-	minikubeVersions, err := getLatestSupportedMinikubeVersions(MiniKubeURL, k8sVersions)
+	// needs to be sorted so we don't end up with false positive diff in the json matrix file
+	sortVersions(kindVersions)
+	logDebug("Found supported kind images: %v", kindVersions)
+
+	minikubeVersions, err := getLatestSupportedMinikubeVersions(miniKubeURL, k8sVersions)
 	if err != nil {
-		log.Printf("failed to get minikube versions: %v", err)
-	}
-	if len(minikubeVersions) > 0 {
-		logDebug("Found supported minikube versions: %v", minikubeVersions)
+		log.Fatalf("failed to get minikube versions: %v", err)
 	}
 
-	if len(kindVersions) == 0 && len(minikubeVersions) == 0 {
+	logDebug("Found supported minikube versions: %v", minikubeVersions)
+
+	if len(kindVersions) == 0 || len(minikubeVersions) == 0 {
 		log.Fatalf("No supported versions found. Run with -debug=true for more info.")
 	}
 
-	path := "ci-matrix.json"
 	currentDir, err := os.Getwd()
 	if err != nil {
 		log.Fatalf("Failed to get current directory: %v ", err)
 	}
-	path = filepath.Join(currentDir, filepath.Clean(path))
+	path := filepath.Join(currentDir, filepath.Clean(ciMatrixPath))
 	err = updateMatrixFile(path, kindVersions, minikubeVersions)
 	if err != nil {
 		log.Fatalf("Failed to update matrix file: %v", err)