Fix nil in log (#1035)

kubesphere · Feb 28, 2024 · 1b26e3f · 1b26e3f
1 parent f0a23fe
commit 1b26e3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/controllers/argocd/multi-cluster-controller.go b/controllers/argocd/multi-cluster-controller.go
@@ -155,7 +155,7 @@ func getArgoClusterConfigObject(configText string) (object *ClusterConfig) {
 	rawDecodedconfig, _ := base64.StdEncoding.DecodeString(configText)
 
 	var kubeconfig *config
-	if kubeconfig = parseKubeConfig(rawDecodedconfig); kubeconfig == nil {
+	if kubeconfig, _ = parseKubeConfig(rawDecodedconfig); kubeconfig == nil {
 		return
 	}
 

diff --git a/controllers/argocd/types.go b/controllers/argocd/types.go
@@ -19,7 +19,6 @@ limitations under the License.
 package argocd
 
 import (
-	"fmt"
 	"gopkg.in/yaml.v2"
 )
 
@@ -58,11 +57,12 @@ type TLSClientConfig struct {
 	CAData []byte `json:"caData,omitempty"`
 }
 
-func parseKubeConfig(data []byte) (cfg *config) {
-	cfg = &config{}
-	err := yaml.Unmarshal(data, cfg)
-	fmt.Println(err)
-	return
+func parseKubeConfig(data []byte) (*config, error) {
+	cfg := &config{}
+	if err := yaml.Unmarshal(data, cfg); err != nil {
+		return nil, err
+	}
+	return cfg, nil
 }
 
 type config struct {

diff --git a/controllers/argocd/types_test.go b/controllers/argocd/types_test.go
@@ -63,7 +63,9 @@ users:
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			assert.Equalf(t, tt.want, parseKubeConfig(tt.args.data), "parseKubeConfig(%v)", tt.args.data)
+			config, err := parseKubeConfig(tt.args.data)
+			assert.Nil(t, err)
+			assert.Equalf(t, tt.want, config, "parseKubeConfig(%v)", tt.args.data)
 		})
 	}
 }