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

KusionStack · Jun 30, 2022 · 6021fd1 · 6021fd1
1 parent afdf541
commit 6021fd1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/...-single-stack/stack/ci-test/settings.yaml → ...nt-single-stack/dev/ci-test/settings.yaml b/...-single-stack/stack/ci-test/settings.yaml → ...nt-single-stack/dev/ci-test/settings.yaml
diff --git a/...al/deployment-single-stack/stack/kcl.yaml → ...rnal/deployment-single-stack/dev/kcl.yaml b/...al/deployment-single-stack/stack/kcl.yaml → ...rnal/deployment-single-stack/dev/kcl.yaml
diff --git a/...rnal/deployment-single-stack/stack/main.k → ...ternal/deployment-single-stack/dev/main.k b/...rnal/deployment-single-stack/stack/main.k → ...ternal/deployment-single-stack/dev/main.k
diff --git a/.../deployment-single-stack/stack/stack.yaml → ...al/deployment-single-stack/dev/stack.yaml b/.../deployment-single-stack/stack/stack.yaml → ...al/deployment-single-stack/dev/stack.yaml
diff --git a/pkg/scaffold/templates.go b/pkg/scaffold/templates.go
@@ -459,20 +459,17 @@ 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)
 			} else {
 				// Stack dir nested in 3rd level or even deeper, eg: meta_app/deployed_unit/stack_dir
 				err = RenderFSTemplate(srcFS, src, destFS, dest, tc)