Skip to content

Commit 87b7f13

Browse files
authored
Merge pull request #1338 from merico-dev/chore-ht
refactor: move all scaffolding repo to devstream/staging/
2 parents e835bf4 + da9b15f commit 87b7f13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+636
-31
lines changed

docs/best-practices/gitops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ tools:
143143
repoType: github
144144
sourceRepo:
145145
org: devstream-io
146-
repo: dtm-scaffolding-python
146+
repo: dtm-repo-scaffolding-python
147147
repoType: github
148148
vars:
149149
imageRepo: [[ dockerUser ]]/[[ app ]]

docs/best-practices/gitops.zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ tools:
143143
repoType: github
144144
sourceRepo:
145145
org: devstream-io
146-
repo: dtm-scaffolding-python
146+
repo: dtm-repo-scaffolding-python
147147
repoType: github
148148
vars:
149149
imageRepo: [[ dockerUser ]]/[[ app ]]

docs/core-concepts/config.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ tools:
109109
repoType: github
110110
sourceRepo:
111111
org: devstream-io
112-
repo: dtm-scaffolding-python
112+
repo: dtm-repo-scaffolding-python
113113
repoType: github
114114
vars:
115115
imageRepo: [[ dockerUser ]]/[[ app ]]
@@ -182,7 +182,7 @@ apps:
182182
scmType: github
183183
owner: devstream-io
184184
org: devstream-io # either owner or org must exist
185-
name: dtm-scaffolding-golang
185+
name: dtm-repo-scaffolding-golang
186186
url: github.com/devstream-io/repo-name # optional. if exists, no need for the scm/owner/org/name sections
187187
vars: # optional
188188
foo: bar # variables used for repoTemplate specifically
@@ -211,7 +211,7 @@ apps:
211211
repo:
212212
url: github.com/ironcore864/myapp1
213213
repoTemplate:
214-
url: github.com/devstream-io/dtm-scaffolding-python
214+
url: github.com/devstream-io/dtm-repo-scaffolding-python
215215
ci:
216216
- type: githubactions
217217
cd:
@@ -276,7 +276,7 @@ apps:
276276
repo:
277277
url: github.com/ironcore864/myapp1
278278
repoTemplate:
279-
url: github.com/devstream-io/dtm-scaffolding-python
279+
url: github.com/devstream-io/dtm-repo-scaffolding-python
280280
ci:
281281
- type: githubactions
282282
cd:

docs/core-concepts/output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ tools:
6060
imageRepo: "ironcore864/golang-demo"
6161
sourceRepo:
6262
org: devstream-io
63-
repo: dtm-scaffolding-golang
63+
repo: dtm-repo-scaffolding-golang
6464
repoType: github
6565
- name: argocd
6666
instanceID: default

docs/plugins/argocdapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ tools:
4848
imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
4949
sourceRepo:
5050
org: devstream-io
51-
repo: dtm-scaffolding-golang
51+
repo: dtm-repo-scaffolding-golang
5252
repoType: github
5353
- name: go-webapp-argocd-deploy
5454
plugin: argocdapp

docs/plugins/repo-scaffolding.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ These repos are official scaffolding repo to use for `sourceRepo` config, You ca
9393

9494
| language | org | repo |
9595
|-------------|---------------|----------------------------|
96-
| Golang | devstream-io | dtm-scaffolding-golang |
97-
| Golang | devstream-io | dtm-scaffolding-golang-cli |
96+
| Golang | devstream-io | dtm-repo-scaffolding-golang |
97+
| Golang | devstream-io | dtm-repo-scaffolding-golang-cli |
9898
| Java Spring | spring-guides | gs-spring-boot |
9999

100100

@@ -113,7 +113,7 @@ tools:
113113
scmType: github
114114
sourceRepo:
115115
org: devstream-io
116-
name: dtm-scaffolding-golang
116+
name: dtm-repo-scaffolding-golang
117117
scmType: github
118118
vars:
119119
imageRepo: dtm-test/golang-repo
@@ -136,7 +136,7 @@ tools:
136136
scmType: github
137137
sourceRepo:
138138
org: devstream-io
139-
name: dtm-scaffolding-golang-cli
139+
name: dtm-repo-scaffolding-golang-cli
140140
scmType: github
141141
```
142142

examples/gitops.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tools:
2727
repoType: github
2828
sourceRepo:
2929
org: devstream-io
30-
repo: dtm-scaffolding-golang
30+
repo: dtm-repo-scaffolding-golang
3131
repoType: github
3232
vars:
3333
imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"

examples/quickstart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tools:
1616
repoType: github
1717
sourceRepo:
1818
org: devstream-io
19-
repo: dtm-scaffolding-golang
19+
repo: dtm-repo-scaffolding-golang
2020
repoType: github
2121
vars:
2222
imageRepo: YOUR_DOCKER_USERNAME/go-webapp-devstream-demo

internal/pkg/configmanager/configmanager_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ apps:
4141
scmType: github
4242
owner: devstream-io
4343
org: devstream-io # choose between owner and org
44-
name: dtm-scaffolding-golang
45-
url: github.com/devstream-io/dtm-scaffolding-golang # optional,if url is specified,we can infer scm/owner/org/name from url
44+
name: dtm-repo-scaffolding-golang
45+
url: github.com/devstream-io/dtm-repo-scaffolding-golang # optional,if url is specified,we can infer scm/owner/org/name from url
4646
ci:
4747
- type: template
4848
templateName: ci-pipeline-for-gh-actions
@@ -199,9 +199,9 @@ pipelineTemplates:
199199
},
200200
"sourceRepo": RawOptions{
201201
"scmType": "github",
202-
"url": git.ScmURL("github.com/devstream-io/dtm-scaffolding-golang"),
202+
"url": git.ScmURL("github.com/devstream-io/dtm-repo-scaffolding-golang"),
203203
"owner": "devstream-io",
204-
"name": "dtm-scaffolding-golang",
204+
"name": "dtm-repo-scaffolding-golang",
205205
"org": "devstream-io",
206206
},
207207
"vars": RawOptions{},

internal/pkg/show/config/default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ tools:
2020
repoType: github
2121
sourceRepo:
2222
org: devstream-io
23-
repo: dtm-scaffolding-golang
23+
repo: dtm-repo-scaffolding-golang
2424
repoType: github

0 commit comments

Comments
 (0)