fix: argocdapp option error and log

Signed-off-by: Meng JiaFeng <[email protected]>

Author: steinliber

cmd/devstream/init.go

@@ -91,18 +91,18 @@ func GetPluginsFromFlags() (tools configmanager.Tools, err error) {
 		// check if plugins to download are supported by dtm
 		for _, plugin := range pluginsName {
 			if _, ok := list.PluginNamesMap()[plugin]; !ok {
-				return nil, fmt.Errorf("Plugin %s is not supported by dtm", plugin)
+				return nil, fmt.Errorf("plugin %s is not supported by dtm", plugin)
 			}
 		}
 	}
 
 	if len(pluginsName) == 0 {
-		return nil, errors.New("Please use --plugins to specify plugins to download or use --all to download all plugins.")
+		return nil, errors.New("please use --plugins to specify plugins to download or use --all to download all plugins")
 	}
 	log.Debugf("plugins to download: %v", pluginsName)
 
 	if initOS == "" || initArch == "" {
-		return nil, fmt.Errorf("Once you use the --all flag, you must specify the --os and --arch flags")
+		return nil, fmt.Errorf("once you use the --all flag, you must specify the --os and --arch flags")
 	}
 
 	log.Infof("Plugins to download: %v", pluginsName)

internal/pkg/configmanager/pipelineDefault.go

@@ -83,13 +83,15 @@ func pipelineArgocdAppGenerator(options RawOptions, globalVars *pipelineGlobalOp
 		sourceMap := source.(RawOptions)
 		if _, repoURLExist := sourceMap["repoURL"]; !repoURLExist {
 			sourceMap["repoURL"] = globalVars.Repo.GetCloneURL()
+			sourceMap["repoBranch"] = globalVars.Repo.Branch
 		}
 		options["source"] = sourceMap
 	} else {
 		options["source"] = RawOptions{
-			"valuefile": "values.yaml",
-			"path":      fmt.Sprintf("helm/%s", globalVars.AppName),
-			"repoURL":   string(globalVars.Repo.GetCloneURL()),
+			"valuefile":  "values.yaml",
+			"path":       fmt.Sprintf("helm/%s", globalVars.AppName),
+			"repoURL":    string(globalVars.Repo.GetCloneURL()),
+			"repoBranch": globalVars.Repo.Branch,
 		}
 	}
 	// config imageRepo default options

internal/pkg/configmanager/pipelineDefault_test.go

@@ -69,6 +69,7 @@ var _ = Describe("pipelineArgocdAppGenerator func", func() {
 			},
 			Repo: &git.RepoInfo{
 				CloneURL: "scm.test.com",
+				Branch:   "testBranch",
 			},
 			AppName: "test_app",
 		}
@@ -85,9 +86,10 @@ var _ = Describe("pipelineArgocdAppGenerator func", func() {
 				"namespace": "default",
 			},
 			"source": RawOptions{
-				"valuefile": "values.yaml",
-				"path":      "helm/test_app",
-				"repoURL":   "https://scm.test.com",
+				"valuefile":  "values.yaml",
+				"path":       "helm/test_app",
+				"repoURL":    "https://scm.test.com",
+				"repoBranch": "testBranch",
 			},
 			"imageRepo": RawOptions{
 				"owner": "test_user",

internal/pkg/plugin/argocdapp/argocdapp.go

@@ -22,7 +22,10 @@ func pushArgocdConfigFiles(rawOptions configmanager.RawOptions) error {
 	}
 
 	// 1. init scm client for check argocdapp config exists and push argocdapp files
-	repoInfo := &git.RepoInfo{CloneURL: git.ScmURL(opts.Source.RepoURL)}
+	repoInfo := &git.RepoInfo{
+		CloneURL: git.ScmURL(opts.Source.RepoURL),
+		Branch:   opts.Source.RepoBranch,
+	}
 	scmClient, err := scm.NewClientWithAuth(repoInfo)
 	if err != nil {
 		return err

internal/pkg/plugin/argocdapp/options.go

@@ -43,9 +43,10 @@ type destination struct {
 
 // source is the struct for the source of an ArgoCD app.
 type source struct {
-	Valuefile string `mapstructure:"valuefile"`
-	Path      string `mapstructure:"path" validate:"required"`
-	RepoURL   string `mapstructure:"repoURL" validate:"required"`
+	Valuefile  string `mapstructure:"valuefile"`
+	Path       string `mapstructure:"path" validate:"required"`
+	RepoURL    string `mapstructure:"repoURL" validate:"required"`
+	RepoBranch string `mapstructure:"repoBranch"`
 }
 
 // / newOptions create options by raw options

internal/pkg/plugin/installer/goclient/installer.go

@@ -1,7 +1,7 @@
 package goclient
 
 import (
-	"errors"
+	"fmt"
 	"strings"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -27,8 +27,7 @@ func DealWithNsWhenInstall(options configmanager.RawOptions) error {
 
 	// Namespace should not be empty
 	if opts.Namespace == "" {
-		log.Debugf("No namespace is given.")
-		return errors.New("No namespace is given.")
+		return fmt.Errorf("config options should set namespace config")
 	}
 	log.Debugf("Prepare to create the namespace: %s.", opts.Namespace)
 

internal/pkg/show/config/plugins/argocdapp.yaml

@@ -27,6 +27,8 @@ tools:
       path: charts/go-hello-http
       # Helm chart repo URL, this is only an example, do not use this
       repoURL: YOUR_CHART_REPO_URL
+      # Helm chart repo branch
+      repoBranch: YOUR_CHART_REPO_BRANCH
     # if repo doesn't contain path, use imageRepo to create a helm config
     imageRepo:
       # imageRepo address