Merge pull request #1349 from merico-dev/fix-docs-old-repo

refactor: delete old repos

Author: IronCore864

.github/sync-staging-repo.yml

@@ -2,18 +2,10 @@ devstream-io/dtm-gitlab-share-library:
   - source: staging/dtm-gitlab-share-library/
     dest: .
     deleteOrphaned: true
-devstream-io/dtm-jenkins-share-library:
-  - source: staging/dtm-jenkins-share-library/
-    dest: .
-    deleteOrphaned: true
 devstream-io/dtm-pipeline-templates:
   - source: staging/dtm-pipeline-templates/
     dest: .
     deleteOrphaned: true
-devstream-io/dtm-repo-scaffolding-golang:
-  - source: staging/dtm-repo-scaffolding-golang/
-    dest: .
-    deleteOrphaned: true
 devstream-io/dtm-repo-scaffolding-golang-cli:
   - source: staging/dtm-repo-scaffolding-golang-cli/
     dest: .
@@ -26,10 +18,6 @@ devstream-io/dtm-repo-scaffolding-java-springboot:
   - source: staging/dtm-repo-scaffolding-java-springboot/
     dest: .
     deleteOrphaned: true
-devstream-io/dtm-repo-scaffolding-python:
-  - source: staging/dtm-repo-scaffolding-python/
-    dest: .
-    deleteOrphaned: true
 devstream-io/dtm-repo-scaffolding-python-flask:
   - source: staging/dtm-repo-scaffolding-python-flask/
     dest: .

docs/plugins/repo-scaffolding.md

@@ -91,11 +91,12 @@ This plugin has three outputs:
 
 These repos are official scaffolding repo to use for `sourceRepo` config, You can use these repo directly or just create one for yourself.
 
-| language    | org           | repo                       |
-|-------------|---------------|----------------------------|
-| Golang      | devstream-io  | dtm-repo-scaffolding-golang     |
-| Golang      | devstream-io  | dtm-repo-scaffolding-golang-cli |
-| Java Spring | spring-guides | gs-spring-boot             |
+| language    | org           | repo                                |
+|-------------|---------------|-------------------------------------|
+| Golang      | devstream-io  | dtm-repo-scaffolding-golang-gin     |
+| Golang      | devstream-io  | dtm-repo-scaffolding-golang-cli     |
+| Python      | devstream-io  | dtm-repo-scaffolding-python-flask   |
+| Java        | devstream-io  | dtm-repo-scaffolding-java-springboot|
 
 
 ### Golang
@@ -113,7 +114,7 @@ tools:
       scmType: github
     sourceRepo:
       org: devstream-io
-      name: dtm-repo-scaffolding-golang
+      name: dtm-repo-scaffolding-golang-gin
       scmType: github
     vars:
       imageRepo: dtm-test/golang-repo
@@ -158,8 +159,8 @@ tools:
       visibility: public
       scmType: gitlab
     sourceRepo:
-      org: spring-guides
-      name: gs-spring-boot
+      org: devstream-io
+      name: dtm-repo-scaffolding-java-springboot
       scmType: github
 ```
 

internal/pkg/configmanager/configmanager_test.go

@@ -41,8 +41,8 @@ apps:
     scmType: github
     owner: devstream-io
     org: devstream-io # choose between owner and org
-    name: dtm-repo-scaffolding-golang
-    url: github.com/devstream-io/dtm-repo-scaffolding-golang # optional，if url is specified，we can infer scm/owner/org/name from url
+    name: dtm-repo-scaffolding-golang-gin
+    url: github.com/devstream-io/dtm-repo-scaffolding-golang-gin # optional，if url is specified，we can infer scm/owner/org/name from url
   ci:
   - type: template
     templateName: ci-pipeline-for-gh-actions
@@ -199,9 +199,9 @@ pipelineTemplates:
 				},
 				"sourceRepo": RawOptions{
 					"scmType": "github",
-					"url":     git.ScmURL("github.com/devstream-io/dtm-repo-scaffolding-golang"),
+					"url":     git.ScmURL("github.com/devstream-io/dtm-repo-scaffolding-golang-gin"),
 					"owner":   "devstream-io",
-					"name":    "dtm-repo-scaffolding-golang",
+					"name":    "dtm-repo-scaffolding-golang-gin",
 					"org":     "devstream-io",
 				},
 				"vars": RawOptions{},

pkg/util/scm/github/download.go

@@ -45,7 +45,7 @@ func (c *Client) DownloadAsset(tagName, assetName, fileName string) error {
 	}
 
 	// 3. get download url
-	// format: https://github.com/merico-dev/dtm-repo-scaffolding-golang/releases/download/v0.0.1/dtm-repo-scaffolding-golang-v0.0.1.tar.gz
+	// format: https://github.com/merico-dev/dtm-repo-scaffolding-golang-gin/releases/download/v0.0.1/dtm-repo-scaffolding-golang-gin-v0.0.1.tar.gz
 	var downloadUrl string
 	for _, a := range assets {
 		if a.GetName() == assetName {

pkg/util/scm/github/github_test.go

@@ -24,12 +24,12 @@ var (
 	OptNotNeedAuth = &git.RepoInfo{
 		Owner: "",
 		Org:   "devstream-io",
-		Repo:  "dtm-repo-scaffolding-golang",
+		Repo:  "dtm-repo-scaffolding-golang-gin",
 	}
 	OptNeedAuth = &git.RepoInfo{
 		Owner:    "",
 		Org:      "devstream-io",
-		Repo:     "dtm-repo-scaffolding-golang",
+		Repo:     "dtm-repo-scaffolding-golang-gin",
 		NeedAuth: true,
 	}
 )