1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
diff --git a/registry/prompt.go b/registry/prompt.go
index e12adcecb9baf93c4ce71d614afe9f25f9a1d766..9f731ebed09f3cebf73d1d4ebe192258ed97280c 100644
--- a/registry/prompt.go
+++ b/registry/prompt.go
@@ -33,9 +33,6 @@ }
if tp.Label == "" {
tp.Label = tp.ID
}
- if tp.Default == nil {
- tp.Default = ""
- }
prompts = append(prompts, tp)
}
@@ -50,52 +47,32 @@ }
// Check if we are using defaults
if defaults {
- val := prompt.Default
- switch t := prompt.Default.(type) {
- case []string:
- for idy, s := range t {
- t[idy] = os.ExpandEnv(s)
- }
- val = t
- case string:
- val = os.ExpandEnv(t)
- }
- s := fmt.Sprint(val)
- prompts[idx].Value = s
- os.Setenv(fmt.Sprintf("TMPL_PROMPT_%s", envKey), s)
+ val := os.ExpandEnv(prompt.Default)
+ prompts[idx].Value = val
+ os.Setenv(fmt.Sprintf("TMPL_PROMPT_%s", envKey), val)
continue
}
+ // Otherwise, prompt
var p survey.Prompt
- switch t := prompt.Default.(type) {
- case []string:
- for idy, s := range t {
- t[idy] = os.ExpandEnv(s)
+ if len(prompt.Options) > 0 {
+ opts := make([]string, 0, len(prompt.Options))
+ for idy, opt := range prompt.Options {
+ opts[idy] = os.ExpandEnv(opt)
}
p = &survey.Select{
Message: prompt.Label,
- Options: t,
+ Options: opts,
Help: prompt.Help,
}
- case bool:
- p = &survey.Confirm{
- Message: prompt.Label,
- Default: t,
- Help: prompt.Help,
- }
- case string:
+ } else {
p = &survey.Input{
Message: prompt.Label,
- Default: os.ExpandEnv(t),
- Help: prompt.Help,
- }
- default:
- p = &survey.Input{
- Message: prompt.Label,
- Default: fmt.Sprint(t),
+ Default: os.ExpandEnv(prompt.Default),
Help: prompt.Help,
}
}
+
var a string
if err := survey.AskOne(p, &a); err != nil {
return nil, err
|