Fix: the return error is changed by the defer function (#228)

Signed-off-by: Daniel Hu <[email protected]>

Author: daniel-hutao

internal/pkg/plugin/argocd/create.go

@@ -28,27 +28,27 @@ func Create(options *map[string]interface{}) (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	var err error
+	var retErr error
 	defer func() {
-		if err == nil {
+		if retErr == nil {
 			return
 		}
-		if err = dealWithNsWhenInterruption(&param); err != nil {
+		if err := dealWithNsWhenInterruption(&param); err != nil {
 			log.Errorf("Failed to deal with namespace: %s.", err)
 		}
 		log.Debugf("Deal with namespace when interruption succeeded.")
 	}()
 
 	var h *helm.Helm
-	h, err = helm.NewHelm(param.GetHelmParam())
-	if err != nil {
-		return nil, err
+	h, retErr = helm.NewHelm(param.GetHelmParam())
+	if retErr != nil {
+		return nil, retErr
 	}
 
 	log.Info("Creating or updating argocd helm chart ...")
-	if err = h.InstallOrUpgradeChart(); err != nil {
-		log.Debugf("Failed to install or upgrade the Chart: %s.", err)
-		return nil, err
+	if retErr = h.InstallOrUpgradeChart(); retErr != nil {
+		log.Debugf("Failed to install or upgrade the Chart: %s.", retErr)
+		return nil, retErr
 	}
 
 	retMap := GetStaticState().ToStringInterfaceMap()
@@ -60,6 +60,7 @@ func Create(options *map[string]interface{}) (map[string]interface{}, error) {
 // TODO(daniel-hutao): All helm-style plugins has this code logic, maybe it's better to move it to a common package.
 func dealWithNsWhenInstall(param *Param) error {
 	if !param.CreateNamespace {
+		log.Debugf("There's no need to delete the namespace for the create_namespace == false in the config file.")
 		return nil
 	}
 

internal/pkg/plugin/jenkins/create.go

@@ -30,38 +30,38 @@ func Create(options *map[string]interface{}) (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	var err error
+	var retErr error
 	defer func() {
-		if err == nil {
+		if retErr == nil {
 			return
 		}
-		if err = dealWithNsWhenInterruption(&param); err != nil {
+		if err := dealWithNsWhenInterruption(&param); err != nil {
 			log.Errorf("Failed to deal with namespace: %s.", err)
 		}
 		log.Debugf("Deal with namespace when interruption succeeded.")
 
 		// Clear all the resources have been created if the creation process interruption.
-		if err = postDelete(); err != nil {
+		if err := postDelete(); err != nil {
 			log.Errorf("Failed to clear the resources have been created: %s.", err)
 		}
 	}()
 
 	var h *helm.Helm
-	h, err = helm.NewHelm(param.GetHelmParam())
-	if err != nil {
-		return nil, err
+	h, retErr = helm.NewHelm(param.GetHelmParam())
+	if retErr != nil {
+		return nil, retErr
 	}
 
 	// pre-create
-	if err = preCreate(); err != nil {
-		log.Errorf("The pre-create logic failed: %s.", err)
-		return nil, err
+	if retErr = preCreate(); retErr != nil {
+		log.Errorf("The pre-create logic failed: %s.", retErr)
+		return nil, retErr
 	}
 
 	log.Info("Installing or updating jenkins helm chart ...")
-	if err = h.InstallOrUpgradeChart(); err != nil {
-		log.Debugf("Failed to install or upgrade the Chart: %s.", err)
-		return nil, err
+	if retErr = h.InstallOrUpgradeChart(); retErr != nil {
+		log.Debugf("Failed to install or upgrade the Chart: %s.", retErr)
+		return nil, retErr
 	}
 
 	releaseName := param.Chart.ReleaseName
@@ -74,6 +74,7 @@ func Create(options *map[string]interface{}) (map[string]interface{}, error) {
 // TODO(daniel-hutao): All helm-style plugins has this code logic, maybe it's better to move it to a common package.
 func dealWithNsWhenInstall(param *Param) error {
 	if !param.CreateNamespace {
+		log.Debugf("There's no need to delete the namespace for the create_namespace == false in the config file.")
 		return nil
 	}
 

internal/pkg/plugin/kubeprometheus/create.go

@@ -28,27 +28,27 @@ func Create(options *map[string]interface{}) (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	var err error
+	var retErr error
 	defer func() {
-		if err == nil {
+		if retErr == nil {
 			return
 		}
-		if err = dealWithNsWhenInterruption(&param); err != nil {
+		if err := dealWithNsWhenInterruption(&param); err != nil {
 			log.Errorf("Failed to deal with namespace: %s.", err)
 		}
 		log.Debugf("Deal with namespace when interruption succeeded.")
 	}()
 
 	var h *helm.Helm
-	h, err = helm.NewHelm(param.GetHelmParam())
-	if err != nil {
-		return nil, err
+	h, retErr = helm.NewHelm(param.GetHelmParam())
+	if retErr != nil {
+		return nil, retErr
 	}
 
 	log.Info("Installing or updating kube-prometheus-stack helm chart ...")
-	if err = h.InstallOrUpgradeChart(); err != nil {
-		log.Debugf("Failed to install or upgrade the Chart: %s.", err)
-		return nil, err
+	if retErr = h.InstallOrUpgradeChart(); retErr != nil {
+		log.Debugf("Failed to install or upgrade the Chart: %s.", retErr)
+		return nil, retErr
 	}
 
 	releaseName := param.Chart.ReleaseName
@@ -61,6 +61,7 @@ func Create(options *map[string]interface{}) (map[string]interface{}, error) {
 // TODO(daniel-hutao): All helm-style plugins has this code logic, maybe it's better to move it to a common package.
 func dealWithNsWhenInstall(param *Param) error {
 	if !param.CreateNamespace {
+		log.Debugf("There's no need to delete the namespace for the create_namespace == false in the config file.")
 		return nil
 	}