Merge pull request #205 from shalb/generation-improve

generation defaults added to interactive mode
shalb · Jun 14, 2023 · 95940ce · 95940ce
2 parents 64c8146 + f8ed411
commit 95940ce
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/pkg/project/templating.go b/pkg/project/templating.go
@@ -45,10 +45,21 @@ func toYaml(in interface{}) (string, error) {
 // Type for tmpl functions list with additional options, like set path to templated file.
 type ExtendedFuncMap template.FuncMap
 
-func (f *ExtendedFuncMap) Get(path string) template.FuncMap {
+func (f *ExtendedFuncMap) Get(path string, s *Stack) template.FuncMap {
 	readFileEx := func(f string) (string, error) {
 		return readFile(f, path)
 	}
+  var p, pathFuncName string
+  if s == nil {
+    pathFuncName = "projectPath"
+    p = config.Global.ProjectConfigsPath
+  } else {
+    pathFuncName = "templatePath"
+    p = filepath.Join(s.TemplateDir)
+  }
+  getPath := func () string  {
+    return p
+  }
 	var templateFunctionsMap = template.FuncMap{
 		"ReconcilerVersionTag": printVersion,
 		"reqEnv":               getEnv,
@@ -57,6 +68,7 @@ func (f *ExtendedFuncMap) Get(path string) template.FuncMap {
 		"cidrSubnet":           utils.CidrSubnet,
 		"toYaml":               toYaml,
 		"readFile":             readFileEx,
+    pathFuncName:           getPath,
 	}
 	for key, val := range sprig.FuncMap() {
 		if _, ok := templateFunctionsMap[key]; !ok {
@@ -125,7 +137,7 @@ func tmplWithMissingKey(data []byte, values interface{}, missingKey string, p *P
 	}
 	// Copy common template functions.
 	funcs := ExtendedFuncMap{}
-	for k, v := range funcs.Get(filepath.Dir(fileName)) {
+	for k, v := range funcs.Get(filepath.Dir(fileName), s) {
 		tmplFuncMap[k] = v
 	}
 	for _, drv := range TemplateDriversMap {

diff --git a/pkg/project/ui/generator.go b/pkg/project/ui/generator.go
@@ -237,7 +237,15 @@ func (g *Generator) RunTemplate() (err error) {
 			continue
 		}
 		for {
-			respond := climenu.GetText(opt.Description, "")
+      message := opt.Description
+      if opt.Default != "" {
+        message = fmt.Sprintf("%s (%s)", opt.Description, opt.Default)
+      }
+			respond := climenu.GetText(message, "")
+      if respond == "" && opt.Default != "" {
+        respond = opt.Default
+      }
+      fmt.Println(respond)
 			if verifyRegex(respond, opt.Regex) {
 				g.dataForTmpl[opt.Name] = respond
 				break

diff --git a/pkg/units/shell/common/state.go b/pkg/units/shell/common/state.go
@@ -117,6 +117,7 @@ func (u *Unit) LoadState(spec interface{}, modKey string, p *project.StateProjec
 	if !exists {
 		return fmt.Errorf("load unit from state: backend '%v' does not exists in curent project", u.BackendName)
 	}
+  stack.Backend = backend
 	u.MyName = modName
 	u.StackPtr = stack
 	u.ProjectPtr = &p.Project

diff --git a/pkg/units/shell/terraform/base/generators.go b/pkg/units/shell/terraform/base/generators.go
@@ -50,6 +50,10 @@ func (u *Unit) genDepsRemoteStates() ([]byte, error) {
 		// De-duplication.
 		DeDuplication[dep.Unit] = true
 		modBackend := dep.Unit.Stack().Backend
+    if dep.Unit.Stack() == nil {
+      continue
+    }
+    // log.Warnf("%v", modBackend)
 		rs, err := modBackend.GetRemoteStateHCL(dep.Unit.Stack().Name, dep.Unit.Name())
 		if err != nil {
 			log.Debug(err.Error())

diff --git a/tests/test-project/local-tmpl/template.yaml b/tests/test-project/local-tmpl/template.yaml
@@ -33,3 +33,4 @@ units:
       test_insert_yaml: {{ insertYAML .variables.list_one }}
       test_map_output: {{ remoteState "this.test-complex-output-data.map[\"key\"]" }}
       test_map_output_direct: {{ remoteState `this.test-complex-output-data.map.key` }}
+      test: {{ templatePath }}