Error handling for RKE Detection Pre-requisites

aquasecurity · Nov 6, 2023 · 91e13e5 · 91e13e5
1 parent 8529fb9
commit 91e13e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/cmd/util.go b/cmd/util.go
@@ -296,13 +296,20 @@ Alternatively, you can specify the version with --version
 
 func getKubeVersion() (*KubeVersion, error) {
 	kubeConfig, err := rest.InClusterConfig()
-
+	if err != nil {
+		glog.V(3).Infof("Error fetching cluster config: %s", err)
+	}
 	isRKE := false
-	if kubeConfig != nil {
+	if err == nil && kubeConfig != nil {
 		k8sClient, err := kubernetes.NewForConfig(kubeConfig)
-		isRKE, err = providers.IsRKE(context.Background(), k8sClient)
 		if err != nil {
-			glog.V(3).Infof("Error detecting RKE cluster: %s", err)
+			glog.V(3).Infof("Failed to fetch k8sClient object from kube config : %s", err)
+		}
+		if err == nil {
+			isRKE, err = providers.IsRKE(context.Background(), k8sClient)
+			if err != nil {
+				glog.V(3).Infof("Error detecting RKE cluster: %s", err)
+			}
 		}
 	}
 

diff --git a/cmd/util_test.go b/cmd/util_test.go
@@ -620,7 +620,7 @@ func Test_getPlatformNameFromKubectlOutput(t *testing.T) {
 		},
 		{
 			name: "rancher1",
-			args: args{s: " v1.25.13-rancher1-1"},
+			args: args{s: "v1.25.13-rancher1-1"},
 			want: Platform{Name: "rancher1", Version: "1.25"},
 		},
 		{