Merge pull request #75 from daniel-hutao/dev-2

refactor: do some refactor with argocdapp plugin

Author: daniel-hutao

internal/pkg/argocdapp/argocdapp.go

@@ -9,15 +9,34 @@ import (
 	"text/template"
 )
 
-func writeContentToTmpFile(file string, content string, param *Param) {
+const defaultYamlPath = "./app.yaml"
+
+const (
+	ActionApply  Action = "apply"
+	ActionDelete Action = "delete"
+)
+
+type Action string
+
+func kubectlAction(action Action, filename string) error {
+	cmd := exec.Command("kubectl", string(action), "-f", filename)
+	stdout, err := cmd.Output()
+	if err != nil {
+		return err
+	}
+	log.Println(strings.TrimSuffix(string(stdout), "\n"))
+	return nil
+}
+
+func writeContentToTmpFile(file string, content string, param *Param) error {
 	t, err := template.New("app").Option("missingkey=error").Parse(content)
 	if err != nil {
-		log.Fatalf("Parse template: %s", err.Error())
+		return err
 	}
 
 	output, err := os.Create(file)
 	if err != nil {
-		log.Fatalf("Create outputFile: %s", err)
+		return err
 	}
 
 	err = t.Execute(output, param)
@@ -26,31 +45,10 @@ func writeContentToTmpFile(file string, content string, param *Param) {
 			msg := err.Error()
 			start := strings.Index(msg, "<")
 			end := strings.Index(msg, ">")
-			log.Fatalf("plugin argocdapp needs options%s but it's missing from the config file", msg[start+1:end])
+			return fmt.Errorf("plugin argocdapp needs options%s but it's missing from the config file", msg[start+1:end])
 		} else {
-			log.Fatalf("Executing tpl: %s", err)
+			return fmt.Errorf("executing tpl: %s", err)
 		}
 	}
-}
-
-func kubectlApply(file string) (bool, error) {
-	cmd := exec.Command("kubectl", "apply", "-f", file)
-	stdout, err := cmd.Output()
-	if err != nil {
-		fmt.Println(err.Error())
-		return false, err
-	}
-	log.Println(strings.TrimSuffix(string(stdout), "\n"))
-	return true, nil
-}
-
-func kubectlDelete(file string) (bool, error) {
-	cmd := exec.Command("kubectl", "delete", "-f", file)
-	stdout, err := cmd.Output()
-	if err != nil {
-		fmt.Println(err.Error())
-		return false, err
-	}
-	log.Println(strings.TrimSuffix(string(stdout), "\n"))
-	return true, nil
+	return nil
 }

internal/pkg/argocdapp/install.go

@@ -1,8 +1,6 @@
 package argocdapp
 
 import (
-	"log"
-
 	"github.com/mitchellh/mapstructure"
 )
 
@@ -11,14 +9,18 @@ func Install(options *map[string]interface{}) (bool, error) {
 	var param Param
 	err := mapstructure.Decode(*options, &param)
 	if err != nil {
-		log.Fatal(err)
+		return false, err
 	}
 
-	file := "./app.yaml"
-	writeContentToTmpFile(file, appTemplate, &param)
-	_, errApply := kubectlApply(file)
-	if errApply != nil {
-		return false, errApply
+	file := defaultYamlPath
+	err = writeContentToTmpFile(file, appTemplate, &param)
+	if err != nil {
+		return false, err
+	}
+
+	err = kubectlAction(ActionDelete, file)
+	if err != nil {
+		return false, err
 	}
 
 	return true, nil

internal/pkg/argocdapp/reinstall.go

@@ -6,33 +6,36 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-// Reinstall an ArgoCD app .
+// Reinstall an ArgoCD app
 func Reinstall(options *map[string]interface{}) (bool, error) {
 	var param Param
 	err := mapstructure.Decode(*options, &param)
 	if err != nil {
 		return false, err
 	}
 
-	file := "./app.yaml"
+	file := defaultYamlPath
 
 	//delete resource
-	_, errDel := kubectlDelete(file)
-	if errDel != nil {
-		return false, errDel
+	err = kubectlAction(ActionDelete, file)
+	if err != nil {
+		return false, err
 	}
 
 	//remove app.yaml file
-	errRemove := os.Remove(file)
-	if errRemove != nil {
+	if err = os.Remove(file); err != nil {
 		return false, err
 	}
 
 	//recreate  app.yaml file
-	writeContentToTmpFile(file, appTemplate, &param)
-	_, errApply := kubectlApply(file)
-	if errApply != nil {
-		return false, errApply
+	err = writeContentToTmpFile(file, appTemplate, &param)
+	if err != nil {
+		return false, err
+	}
+
+	err = kubectlAction(ActionApply, file)
+	if err != nil {
+		return false, err
 	}
 
 	return true, nil

internal/pkg/argocdapp/uninstall.go

@@ -14,14 +14,15 @@ func Uninstall(options *map[string]interface{}) (bool, error) {
 		return false, err
 	}
 
-	file := "./app.yaml"
-	_, errDel := kubectlDelete(file)
-	if errDel != nil {
-		return false, errDel
+	file := defaultYamlPath
+	err = kubectlAction(ActionDelete, file)
+	if err != nil {
+		return false, err
 	}
-	errRemove := os.Remove(file)
-	if errRemove != nil {
-		return false, errRemove
+
+	if err = os.Remove(file); err != nil {
+		return false, err
 	}
+
 	return true, nil
 }