Skip to content

Commit b245d5e

Browse files
committed
linter
1 parent 9076dd6 commit b245d5e

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

cli/templatecreate.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,12 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
107107

108108
message := uploadFlags.templateMessage(inv)
109109

110-
varsFiles, err := DiscoverVarsFiles(uploadFlags.stdin(), uploadFlags.directory)
111-
if err != nil {
112-
return err
110+
var varsFiles []string
111+
if !uploadFlags.stdin() {
112+
varsFiles, err = DiscoverVarsFiles(uploadFlags.directory)
113+
if err != nil {
114+
return err
115+
}
113116
}
114117

115118
// Confirm upload of the directory.

cli/templatepush.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,12 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
7878

7979
message := uploadFlags.templateMessage(inv)
8080

81-
varsFiles, err := DiscoverVarsFiles(uploadFlags.stdin(), uploadFlags.directory)
82-
if err != nil {
83-
return err
81+
var varsFiles []string
82+
if !uploadFlags.stdin() {
83+
varsFiles, err = DiscoverVarsFiles(uploadFlags.directory)
84+
if err != nil {
85+
return err
86+
}
8487
}
8588

8689
resp, err := uploadFlags.upload(inv, client)

cli/templatevariables.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ import (
1818
* 3. *.auto.tfvars
1919
* 4. *.auto.tfvars.json
2020
*/
21-
func DiscoverVarsFiles(stdin bool, workDir string) ([]string, error) {
21+
func DiscoverVarsFiles(workDir string) ([]string, error) {
2222
var found []string
23-
if stdin {
24-
return found, nil // it is not possible to define multiple files in the stdin mode
25-
}
2623

2724
fi, err := os.Stat(filepath.Join(workDir, "terraform.tfvars"))
2825
if err == nil {

0 commit comments

Comments
 (0)