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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
diff --git a/registry/prompt.go b/registry/prompt.go
index d0d34cfa2852248c909e09c5b547608325068458..e12adcecb9baf93c4ce71d614afe9f25f9a1d766 100644
--- a/registry/prompt.go
+++ b/registry/prompt.go
@@ -2,112 +2,97 @@ package registry
import (
"fmt"
- "io/ioutil"
"os"
"path/filepath"
- "sort"
"strings"
"text/template"
+
+ "go.jolheiser.com/tmpl/config"
"github.com/AlecAivazis/survey/v2"
- "github.com/pelletier/go-toml"
)
-type templatePrompt struct {
- Key string `toml:"-"`
- Value interface{} `toml:"-"`
- Message string `toml:"prompt"`
- Help string `toml:"help"`
- Default interface{} `toml:"default"`
-}
-
func prompt(dir string, defaults bool) (templatePrompts, error) {
- templatePath := filepath.Join(dir, "template.toml")
- if _, err := os.Lstat(templatePath); err != nil {
- return nil, err
- }
-
- templateBytes, err := ioutil.ReadFile(templatePath)
+ templatePath := filepath.Join(dir, "tmpl.yaml")
+ fi, err := os.Open(templatePath)
if err != nil {
return nil, err
}
-
- // Expand the template with environment variables
- templateContents := os.ExpandEnv(string(templateBytes))
+ defer fi.Close()
- tree, err := toml.Load(templateContents)
+ cfg, err := config.Load(fi)
if err != nil {
return nil, err
}
- prompts := make(templatePrompts, len(tree.Keys()))
- for idx, k := range tree.Keys() {
- v := tree.Get(k)
-
- obj, ok := v.(*toml.Tree)
- if !ok {
- prompts[idx] = templatePrompt{
- Key: k,
- Message: k,
- Default: v,
- }
- continue
+ prompts := make(templatePrompts, 0, len(cfg.Prompts))
+ for _, prompt := range cfg.Prompts {
+ tp := templatePrompt{
+ Prompt: prompt,
}
-
- var p templatePrompt
- if err := obj.Unmarshal(&p); err != nil {
- return nil, err
+ if tp.Label == "" {
+ tp.Label = tp.ID
}
- p.Key = k
- if p.Message == "" {
- p.Message = p.Key
+ if tp.Default == nil {
+ tp.Default = ""
}
- if p.Default == nil {
- p.Default = ""
- }
- prompts[idx] = p
+ prompts = append(prompts, tp)
}
- // Sort the prompts so they are consistent
- sort.Sort(prompts)
-
for idx, prompt := range prompts {
// Check for env variable
- if e, ok := os.LookupEnv(fmt.Sprintf("TMPL_VAR_%s", strings.ToUpper(prompt.Key))); ok {
+ envKey := strings.ToUpper(prompt.ID)
+ if e, ok := os.LookupEnv(fmt.Sprintf("TMPL_VAR_%s", envKey)); ok {
prompts[idx].Value = e
+ os.Setenv(fmt.Sprintf("TMPL_PROMPT_%s", envKey), e)
continue
}
// Check if we are using defaults
if defaults {
- prompts[idx].Value = prompt.Default
+ 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)
continue
}
var p survey.Prompt
switch t := prompt.Default.(type) {
case []string:
+ for idy, s := range t {
+ t[idy] = os.ExpandEnv(s)
+ }
p = &survey.Select{
- Message: prompt.Message,
+ Message: prompt.Label,
Options: t,
Help: prompt.Help,
}
case bool:
p = &survey.Confirm{
- Message: prompt.Message,
+ Message: prompt.Label,
Default: t,
Help: prompt.Help,
}
case string:
p = &survey.Input{
- Message: prompt.Message,
- Default: t,
+ Message: prompt.Label,
+ Default: os.ExpandEnv(t),
Help: prompt.Help,
}
default:
p = &survey.Input{
- Message: prompt.Message,
- Default: fmt.Sprintf("%v", t),
+ Message: prompt.Label,
+ Default: fmt.Sprint(t),
Help: prompt.Help,
}
}
@@ -116,45 +101,36 @@ if err := survey.AskOne(p, &a); err != nil {
return nil, err
}
prompts[idx].Value = a
+ os.Setenv(fmt.Sprintf("TMPL_PROMPT_%s", envKey), a)
}
return prompts, nil
}
+type templatePrompt struct {
+ config.Prompt
+ Value string
+}
+
type templatePrompts []templatePrompt
// ToMap converts a slice to templatePrompt into a suitable template context
-func (t templatePrompts) ToMap() map[string]interface{} {
- m := make(map[string]interface{})
+func (t templatePrompts) ToMap() map[string]any {
+ m := make(map[string]any)
for _, p := range t {
- m[p.Key] = p.Value
+ m[p.ID] = p.Value
}
return m
}
// ToFuncMap converts a slice of templatePrompt into a suitable template.FuncMap
func (t templatePrompts) ToFuncMap() template.FuncMap {
- m := make(map[string]interface{})
+ m := make(map[string]any)
for k, v := range t.ToMap() {
vv := v // Enclosure
- m[k] = func() interface{} {
+ m[k] = func() any {
return vv
}
}
return m
}
-
-// Len is for sort.Sort
-func (t templatePrompts) Len() int {
- return len(t)
-}
-
-// Less is for sort.Sort
-func (t templatePrompts) Less(i, j int) bool {
- return t[i].Key > t[j].Key
-}
-
-// Swap is for sort.Sort
-func (t templatePrompts) Swap(i, j int) {
- t[i], t[j] = t[j], t[i]
-}
|