Merge pull request #1308 from merico-dev/bugfix-ht

daniel-hutao · web-flow · commit 0e1b98fcf04c · 2022-12-06T19:26:33.000+08:00
Fix: Quickstart Workflow Failed With var ImageRepo Error
diff --git a/docs/core-concepts/output.md b/docs/core-concepts/output.md
@@ -57,7 +57,7 @@ tools:
       branch: main
       repoType: github
     vars:
-      ImageRepo: "ironcore864/golang-demo"
+      imageRepo: "ironcore864/golang-demo"
     sourceRepo:
       org: devstream-io
       repo: dtm-scaffolding-golang
diff --git a/docs/plugins/argocdapp.md b/docs/plugins/argocdapp.md
@@ -45,7 +45,7 @@ tools:
       branch: [[ defaultBranch ]]
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
     sourceRepo:
       org: devstream-io
       repo: dtm-scaffolding-golang
diff --git a/docs/plugins/repo-scaffolding.md b/docs/plugins/repo-scaffolding.md
@@ -116,7 +116,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: dtm-test/golang-repo
+      imageRepo: dtm-test/golang-repo
 ```
 
 This config will create `dtm-test-golang` repo for user test_owner in GitHub, and the variable ImageRepo will be used for template render. 
diff --git a/examples/gitops.yaml b/examples/gitops.yaml
@@ -30,7 +30,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
 - name: jira-github-integ
   instanceID: default
   dependsOn: [ "repo-scaffolding.golang-github" ]
diff --git a/examples/quickstart.yaml b/examples/quickstart.yaml
@@ -19,7 +19,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: YOUR_DOCKER_USERNAME/go-webapp-devstream-demo
+      imageRepo: YOUR_DOCKER_USERNAME/go-webapp-devstream-demo
 - name: githubactions-golang
   instanceID: default
   dependsOn: ["repo-scaffolding.golang-github"]
diff --git a/internal/pkg/plugin/installer/reposcaffolding/installer.go b/internal/pkg/plugin/installer/reposcaffolding/installer.go
@@ -35,8 +35,7 @@ func InstallRepo(options configmanager.RawOptions) error {
 		processRepoFileFunc(appName, opts.renderTplConfig()),
 	)
 	if err != nil {
-		log.Warnf("repoScaffolding render repoTemplate failed=> %+v", err)
-		return fmt.Errorf("render RepoTemplate files failed")
+		return fmt.Errorf("render RepoTemplate files failed with error: %w", err)
 	}
 
 	// 3. push repo to DestinationRepo
diff --git a/internal/pkg/show/config/plugins/repo-scaffolding.yaml b/internal/pkg/show/config/plugins/repo-scaffolding.yaml
@@ -23,4 +23,4 @@ tools:
       repoType: YOUR_TEMPLATE_REPO_TYPE
     # this is used for template render
     vars:
-      ImageRepo: YOUR_DOCKERHUB_REPOSITORY
+      imageRepo: YOUR_DOCKERHUB_REPOSITORY
diff --git a/internal/pkg/show/config/templates/gitops.yaml b/internal/pkg/show/config/templates/gitops.yaml
@@ -30,7 +30,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
 - name: jira-github-integ
   instanceID: default
   dependsOn: [ "repo-scaffolding.golang-github" ]
diff --git a/internal/pkg/show/config/templates/quickstart.yaml b/internal/pkg/show/config/templates/quickstart.yaml
@@ -1,5 +1,5 @@
 config:
-  state:
+  state: # state config, backend can be local, s3 or k8s
     backend: local
     options:
       stateFile: devstream.state
diff --git a/test/e2e/yaml/e2e-test-local.yaml b/test/e2e/yaml/e2e-test-local.yaml
@@ -23,7 +23,7 @@ tools:
       branch: [[ defaultBranch ]]
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
     sourceRepo:
       org: devstream-io
       repo: dtm-scaffolding-golang

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ func InstallRepo(options configmanager.RawOptions) error {`
`35`	`35`	`processRepoFileFunc(appName, opts.renderTplConfig()),`
`36`	`36`	`)`
`37`	`37`	`if err != nil {`
`38`		`- log.Warnf("repoScaffolding render repoTemplate failed=> %+v", err)`
`39`		`- return fmt.Errorf("render RepoTemplate files failed")`
	`38`	`+ return fmt.Errorf("render RepoTemplate files failed with error: %w", err)`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`// 3. push repo to DestinationRepo`