Merge pull request #1370 from devstream-io/main

bugfix for v0.10.3

Author: daniel-hutao

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -28,8 +28,8 @@ body:
     label: 'DevStream Version'
     description: "To find out the version run: `dtm version`"
     options:
-      - < v0.10.0
-      - v0.10.0
+      - < v0.10.3
+      - v0.10.3
       - latest
   validations:
     required: true

.github/sync-staging-repo.yml

@@ -1,5 +1,5 @@
-devstream-io/dtm-gitlab-share-library:
-  - source: staging/dtm-gitlab-share-library/
+devstream-io/dtm-jenkins-share-library:
+  - source: staging/dtm-jenkins-share-library/
     dest: .
     deleteOrphaned: true
 devstream-io/dtm-pipeline-templates:

.github/workflows/automated-release.yml

@@ -41,6 +41,8 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-southeast-1
+      - name: check md5 & commit
+        run: git rev-parse HEAD && md5sum dtm*
       - name: upload core
         run: bash -e ./hack/release/upload_dtm_core.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
       - name: upload plugin
@@ -83,4 +85,3 @@ jobs:
         run: bash -e ./hack/release/upload_dtm_core.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
       - name: upload plugins to s3
         run: aws s3 cp ~/.devstream/plugins/ s3://download.devstream.io/${{ env.TAG }}/ --recursive --acl public-read
-

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)

hack/release/auto-release-darwin-arm64.sh

@@ -73,7 +73,7 @@ pip3 install awscli
 aws s3 cp $plugin_dir $STORAGE_URL_WITH_TAG --recursive --acl public-read
 
 # check if the number of plugins on s3 is correct
-local_plugin_nums=$(../../dtm list plugins |wc -l)
+local_plugin_nums=$(./dtm list plugins |wc -l)
 ((local_plugin_file_nums=local_plugin_nums*6))
 s3_plugin_file_total_nums=$(aws s3 ls download.devstream.io/"$tag"/|awk '{print $NF}'|uniq|wc -l)
 ((s3_plugin_file_nums=s3_plugin_file_total_nums-3))

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/configmanager/variables.go

@@ -8,12 +8,10 @@ import (
 func renderConfigWithVariables(fileContent string, variables map[string]interface{}) ([]byte, error) {
 	logFunc(fileContent, variables)
 
-	str, err := template.New().
-		FromContent(fileContent).
-		AddDotForVariablesInConfigProcessor().
-		AddQuoteForVariablesInConfigProcessor().
-		SetDefaultRender(fileContent, variables).
-		Render()
+	str, err := template.NewRenderClient(&template.TemplateOption{
+		Name: "configmanager",
+	}, template.ContentGetter, template.AddDotForVariablesInConfigProcessor, template.AddQuoteForVariablesInConfigProcessor,
+	).Render(fileContent, variables)
 
 	if err != nil {
 		return nil, err

internal/pkg/develop/plugin/plugin.go

@@ -79,7 +79,12 @@ func (p *Plugin) renderTplString(tplStr string) (string, error) {
 		"dirFormat": pluginTpl.FormatPackageDirName,
 	}
 
-	res, err := templateUtil.New().FromContent(tplStr).SetDefaultRender("default", *p, funcMap).Render()
+	res, err := templateUtil.NewRenderClient(
+		&templateUtil.TemplateOption{
+			Name:    "plugins",
+			FuncMap: funcMap,
+		}, templateUtil.ContentGetter,
+	).Render(tplStr, *p)
 	if err != nil {
 		log.Debugf("Template execute failed: %s.", err)
 		log.Debugf("Template content: %s.", tplStr)

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