Skip to content

Commit 0672248

Browse files
authored
fix: missing projectName context in prompt:execute (#410)
1 parent 1c4180e commit 0672248

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

internal/init/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func Init(outDir string, localModulePath string) *projectconfig.ZeroProjectConfi
5151
// Prompting for push-up stream, then conditionally prompting for github
5252
prompts["GithubRootOrg"].RunPrompt(initParams, emptyEnvVarTranslationMap)
5353

54-
projectData := promptAllModules(moduleConfigs)
54+
projectData := promptAllModules(moduleConfigs, &projectConfig)
5555

5656
// Map parameter values back to specific modules
5757
for moduleName, module := range moduleConfigs {

internal/init/prompts.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
tm "github.com/buger/goterm"
1313
"github.com/commitdev/zero/internal/config/moduleconfig"
14+
"github.com/commitdev/zero/internal/config/projectconfig"
1415
"github.com/commitdev/zero/internal/constants"
1516
"github.com/commitdev/zero/internal/util"
1617
"github.com/commitdev/zero/pkg/util/exit"
@@ -276,8 +277,8 @@ func PromptModuleParams(moduleConfig moduleconfig.ModuleConfig, parameters map[s
276277
// promptAllModules takes a map of all the modules and prompts the user for values for all the parameters
277278
// Important: This is done here because in this step we share the parameter across modules,
278279
// meaning if module A and B both asks for region, it will reuse the response for both (and is deduped during runtime)
279-
func promptAllModules(modules map[string]moduleconfig.ModuleConfig) map[string]string {
280-
parameterValues := map[string]string{}
280+
func promptAllModules(modules map[string]moduleconfig.ModuleConfig, projectConfig *projectconfig.ZeroProjectConfig) map[string]string {
281+
parameterValues := availableProjectContext(projectConfig)
281282
for _, config := range modules {
282283
var err error
283284

@@ -289,6 +290,13 @@ func promptAllModules(modules map[string]moduleconfig.ModuleConfig) map[string]s
289290
return parameterValues
290291
}
291292

293+
// availableProjectContext declares a list of variables usable in modules parameter prompt's execute step
294+
func availableProjectContext(projectConfig *projectconfig.ZeroProjectConfig) map[string]string {
295+
return map[string]string{
296+
"projectName": projectConfig.Name,
297+
}
298+
}
299+
292300
func paramConditionsMapper(conditions []moduleconfig.Condition) CustomConditionSignature {
293301
if len(conditions) == 0 {
294302
return NoCondition

0 commit comments

Comments
 (0)