Skip to content

Commit af67cc2

Browse files
mtojekmtojek
committed
refactor(cli): loading template variables
1 parent 89d8a29 commit af67cc2

File tree

3 files changed

+100
-70
lines changed

3 files changed

+100
-70
lines changed

‎cli/templatecreate.go

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"fmt"
66
"io"
77
"net/http"
8-
"os"
9-
"path/filepath"
108
"strings"
119
"time"
1210
"unicode/utf8"
@@ -27,7 +25,7 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
2725
provisioner string
2826
provisionerTags []string
2927
variablesFile string
30-
variables []string
28+
commandLineVariables []string
3129
disableEveryone bool
3230
requireActiveVersion bool
3331

@@ -129,15 +127,21 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
129127
return err
130128
}
131129

130+
userVariableValues, err := ParseUserVariableValues(
131+
variablesFile,
132+
commandLineVariables)
133+
if err != nil {
134+
return err
135+
}
136+
132137
job, err := createValidTemplateVersion(inv, createValidTemplateVersionArgs{
133-
Message: message,
134-
Client: client,
135-
Organization: organization,
136-
Provisioner: codersdk.ProvisionerType(provisioner),
137-
FileID: resp.ID,
138-
ProvisionerTags: tags,
139-
VariablesFile: variablesFile,
140-
Variables: variables,
138+
Message: message,
139+
Client: client,
140+
Organization: organization,
141+
Provisioner: codersdk.ProvisionerType(provisioner),
142+
FileID: resp.ID,
143+
ProvisionerTags: tags,
144+
UserVariableValues: userVariableValues,
141145
})
142146
if err != nil {
143147
return err
@@ -197,12 +201,12 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
197201
{
198202
Flag: "variable",
199203
Description: "Specify a set of values for Terraform-managed variables.",
200-
Value: clibase.StringArrayOf(&variables),
204+
Value: clibase.StringArrayOf(&commandLineVariables),
201205
},
202206
{
203207
Flag: "var",
204208
Description: "Alias of --variable.",
205-
Value: clibase.StringArrayOf(&variables),
209+
Value: clibase.StringArrayOf(&commandLineVariables),
206210
},
207211
{
208212
Flag: "provisioner-tag",
@@ -267,40 +271,27 @@ type createValidTemplateVersionArgs struct {
267271
Provisioner codersdk.ProvisionerType
268272
FileID uuid.UUID
269273

270-
VariablesFile string
271-
Variables []string
272-
273274
// Template is only required if updating a template's active version.
274275
Template *codersdk.Template
275276
// ReuseParameters will attempt to reuse params from the Template field
276277
// before prompting the user. Set to false to always prompt for param
277278
// values.
278-
ReuseParameters bool
279-
ProvisionerTags map[string]string
279+
ReuseParameters bool
280+
ProvisionerTags map[string]string
281+
UserVariableValues []codersdk.VariableValue
280282
}
281283

282284
func createValidTemplateVersion(inv *clibase.Invocation, args createValidTemplateVersionArgs) (*codersdk.TemplateVersion, error) {
283285
client := args.Client
284286

285-
variableValues, err := loadVariableValuesFromFile(args.VariablesFile)
286-
if err != nil {
287-
return nil, err
288-
}
289-
290-
variableValuesFromKeyValues, err := loadVariableValuesFromOptions(args.Variables)
291-
if err != nil {
292-
return nil, err
293-
}
294-
variableValues = append(variableValues, variableValuesFromKeyValues...)
295-
296287
req := codersdk.CreateTemplateVersionRequest{
297288
Name: args.Name,
298289
Message: args.Message,
299290
StorageMethod: codersdk.ProvisionerStorageMethodFile,
300291
FileID: args.FileID,
301292
Provisioner: args.Provisioner,
302293
ProvisionerTags: args.ProvisionerTags,
303-
UserVariableValues: variableValues,
294+
UserVariableValues: args.UserVariableValues,
304295
}
305296
if args.Template != nil {
306297
req.TemplateID = args.Template.ID
@@ -364,23 +355,6 @@ func createValidTemplateVersion(inv *clibase.Invocation, args createValidTemplat
364355
return &version, nil
365356
}
366357

367-
// prettyDirectoryPath returns a prettified path when inside the users
368-
// home directory. Falls back to dir if the users home directory cannot
369-
// discerned. This function calls filepath.Clean on the result.
370-
func prettyDirectoryPath(dir string) string {
371-
dir = filepath.Clean(dir)
372-
homeDir, err := os.UserHomeDir()
373-
if err != nil {
374-
return dir
375-
}
376-
prettyDir := dir
377-
if strings.HasPrefix(prettyDir, homeDir) {
378-
prettyDir = strings.TrimPrefix(prettyDir, homeDir)
379-
prettyDir = "~" + prettyDir
380-
}
381-
return prettyDir
382-
}
383-
384358
func ParseProvisionerTags(rawTags []string) (map[string]string, error) {
385359
tags := map[string]string{}
386360
for _, rawTag := range rawTags {

‎cli/templatepush.go

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bufio"
55
"fmt"
66
"io"
7+
"os"
78
"path/filepath"
89
"strings"
910
"time"
@@ -61,12 +62,30 @@ func (pf *templateUploadFlags) stdin() bool {
6162
return pf.directory == "-"
6263
}
6364

65+
func (pf *templateUploadFlags) prettyDirectoryPath() string {
66+
if pf.stdin() {
67+
return ""
68+
}
69+
70+
dir := filepath.Clean(pf.directory)
71+
homeDir, err := os.UserHomeDir()
72+
if err != nil {
73+
return dir
74+
}
75+
prettyDir := dir
76+
if strings.HasPrefix(prettyDir, homeDir) {
77+
prettyDir = strings.TrimPrefix(prettyDir, homeDir)
78+
prettyDir = "~" + prettyDir
79+
}
80+
return prettyDir
81+
}
82+
6483
func (pf *templateUploadFlags) upload(inv *clibase.Invocation, client *codersdk.Client) (*codersdk.UploadResponse, error) {
6584
var content io.Reader
6685
if pf.stdin() {
6786
content = inv.Stdin
6887
} else {
69-
prettyDir := prettyDirectoryPath(pf.directory)
88+
prettyDir := pf.prettyDirectoryPath()
7089
_, err := cliui.Prompt(inv, cliui.PromptOptions{
7190
Text: fmt.Sprintf("Upload %q?", prettyDir),
7291
IsConfirm: true,
@@ -155,16 +174,16 @@ func (pf *templateUploadFlags) templateName(args []string) (string, error) {
155174

156175
func (r *RootCmd) templatePush() *clibase.Cmd {
157176
var (
158-
versionName string
159-
provisioner string
160-
workdir string
161-
variablesFile string
162-
variables []string
163-
alwaysPrompt bool
164-
provisionerTags []string
165-
uploadFlags templateUploadFlags
166-
activate bool
167-
create bool
177+
versionName string
178+
provisioner string
179+
workdir string
180+
variablesFile string
181+
commandLineVariables []string
182+
alwaysPrompt bool
183+
provisionerTags []string
184+
uploadFlags templateUploadFlags
185+
activate bool
186+
create bool
168187
)
169188
client := new(codersdk.Client)
170189
cmd := &clibase.Cmd{
@@ -213,15 +232,21 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
213232
return err
214233
}
215234

235+
userVariableValues, err := ParseUserVariableValues(
236+
variablesFile,
237+
commandLineVariables)
238+
if err != nil {
239+
return err
240+
}
241+
216242
args := createValidTemplateVersionArgs{
217-
Message: message,
218-
Client: client,
219-
Organization: organization,
220-
Provisioner: codersdk.ProvisionerType(provisioner),
221-
FileID: resp.ID,
222-
ProvisionerTags: tags,
223-
VariablesFile: variablesFile,
224-
Variables: variables,
243+
Message: message,
244+
Client: client,
245+
Organization: organization,
246+
Provisioner: codersdk.ProvisionerType(provisioner),
247+
FileID: resp.ID,
248+
ProvisionerTags: tags,
249+
UserVariableValues: userVariableValues,
225250
}
226251

227252
if !createTemplate {
@@ -291,12 +316,12 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
291316
{
292317
Flag: "variable",
293318
Description: "Specify a set of values for Terraform-managed variables.",
294-
Value: clibase.StringArrayOf(&variables),
319+
Value: clibase.StringArrayOf(&commandLineVariables),
295320
},
296321
{
297322
Flag: "var",
298323
Description: "Alias of --variable.",
299-
Value: clibase.StringArrayOf(&variables),
324+
Value: clibase.StringArrayOf(&commandLineVariables),
300325
},
301326
{
302327
Flag: "provisioner-tag",

‎cli/templatevariables.go

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,21 @@ import (
1010
"github.com/coder/coder/v2/codersdk"
1111
)
1212

13-
func loadVariableValuesFromFile(variablesFile string) ([]codersdk.VariableValue, error) {
13+
func ParseUserVariableValues(variablesFile string, commandLineVariables []string) ([]codersdk.VariableValue, error) {
14+
fromFile, err := parseVariableValuesFromFile(variablesFile)
15+
if err != nil {
16+
return nil, err
17+
}
18+
19+
fromCommandLine, err := parseVariableValuesFromCommandLine(commandLineVariables)
20+
if err != nil {
21+
return nil, err
22+
}
23+
24+
return combineVariableValues(fromFile, fromCommandLine), nil
25+
}
26+
27+
func parseVariableValuesFromFile(variablesFile string) ([]codersdk.VariableValue, error) {
1428
var values []codersdk.VariableValue
1529
if variablesFile == "" {
1630
return values, nil
@@ -50,7 +64,7 @@ func createVariablesMapFromFile(variablesFile string) (map[string]string, error)
5064
return variablesMap, nil
5165
}
5266

53-
func loadVariableValuesFromOptions(variables []string) ([]codersdk.VariableValue, error) {
67+
func parseVariableValuesFromCommandLine(variables []string) ([]codersdk.VariableValue, error) {
5468
var values []codersdk.VariableValue
5569
for _, keyValue := range variables {
5670
split := strings.SplitN(keyValue, "=", 2)
@@ -65,3 +79,20 @@ func loadVariableValuesFromOptions(variables []string) ([]codersdk.VariableValue
6579
}
6680
return values, nil
6781
}
82+
83+
func combineVariableValues(valuesSets ...[]codersdk.VariableValue) []codersdk.VariableValue {
84+
combinedValues := make(map[string]string)
85+
86+
for _, values := range valuesSets {
87+
for _, v := range values {
88+
combinedValues[v.Name] = v.Value
89+
}
90+
}
91+
92+
var result []codersdk.VariableValue
93+
for name, value := range combinedValues {
94+
result = append(result, codersdk.VariableValue{Name: name, Value: value})
95+
}
96+
97+
return result
98+
}

0 commit comments

Comments
 (0)