Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: render or skip stack based on stackConfigs is provided or not #83

Merged
merged 1 commit into from
Jul 5, 2022
Merged

refactor: render or skip stack based on stackConfigs is provided or not #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...-single-stack/stack/ci-test/settings.yaml → ...nt-single-stack/dev/ci-test/settings.yaml
View file
Open in desktop
File renamed without changes.
0 ...al/deployment-single-stack/stack/kcl.yaml → ...rnal/deployment-single-stack/dev/kcl.yaml
View file
Open in desktop
File renamed without changes.
0 ...rnal/deployment-single-stack/stack/main.k → ...ternal/deployment-single-stack/dev/main.k
View file
Open in desktop
File renamed without changes.
0 .../deployment-single-stack/stack/stack.yaml → ...al/deployment-single-stack/dev/stack.yaml
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions pkg/scaffold/internal_templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ func Test_readIntoFS(t *testing.T) {
"internal/deployment-single-stack/README.md",
"internal/deployment-single-stack/base",
"internal/deployment-single-stack/base/base.k",
"internal/deployment-single-stack/dev",
"internal/deployment-single-stack/dev/ci-test",
"internal/deployment-single-stack/dev/ci-test/settings.yaml",
"internal/deployment-single-stack/dev/kcl.yaml",
"internal/deployment-single-stack/dev/main.k",
"internal/deployment-single-stack/dev/stack.yaml",
"internal/deployment-single-stack/kusion.yaml",
"internal/deployment-single-stack/project.yaml",
"internal/deployment-single-stack/stack",
"internal/deployment-single-stack/stack/ci-test",
"internal/deployment-single-stack/stack/ci-test/settings.yaml",
"internal/deployment-single-stack/stack/kcl.yaml",
"internal/deployment-single-stack/stack/main.k",
"internal/deployment-single-stack/stack/stack.yaml",
}
assert.Equal(t, want, got)
}
26 changes: 13 additions & 13 deletions pkg/scaffold/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,19 +459,19 @@ func RenderFSTemplate(srcFS afero.Fs, srcDir string, destFS afero.Fs, destDir st
for k, v := range tc.ProjectConfig {
configs[k] = v
}
// Walk each stack
for stackName, stackConfigs := range tc.StacksConfig {
// Use stack name as sub dir
dest = filepath.Join(destDir, stackName)
// Merge and override project config
for k, v := range stackConfigs {
configs[k] = v
}
// Walk stack dir with merged configs
err = walkFiles(srcFS, src, destFS, dest, configs)
if err != nil {
return err
}
// Skip if stackConfigs are not provided
stackConfigs, exits := tc.StacksConfig[fileInfo.Name()]
if !exits {
continue
}
// Merge and override project config
for k, v := range stackConfigs {
configs[k] = v
}
// Walk stack dir with merged configs
err = walkFiles(srcFS, src, destFS, dest, configs)
if err != nil {
return err
}
} else {
// Stack dir nested in 3rd level or even deeper, eg: meta_app/deployed_unit/stack_dir
Expand Down