Merge pull request #8830 from hashicorp/d-var-file-hcl2-not-yet

SwampDragons · web-flow · commit e35a872414ea · 2020-03-03T13:13:05.000-08:00
document that the `-var-file` option still expects JSON files for now
diff --git a/command/build.go b/command/build.go
@@ -419,7 +419,7 @@ Options:
   -parallel-builds=1            Number of builds to run in parallel. 0 means no limit (Default: 0)
   -timestamp-ui                 Enable prefixing of each ui output with an RFC3339 timestamp.
   -var 'key=value'              Variable for templates, can be used multiple times.
-  -var-file=path                JSON file containing user variables.
+  -var-file=path                JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ]
 `
 
 	return strings.TrimSpace(helpText)
diff --git a/command/console.go b/command/console.go
@@ -92,7 +92,7 @@ Usage: packer console [options] [TEMPLATE]
 
 Options:
   -var 'key=value'       Variable for templates, can be used multiple times.
-  -var-file=path         JSON file containing user variables.
+  -var-file=path         JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ]
 `
 
 	return strings.TrimSpace(helpText)
diff --git a/command/validate.go b/command/validate.go
@@ -183,7 +183,7 @@ Options:
   -except=foo,bar,baz    Validate all builds other than these.
   -only=foo,bar,baz      Validate only these builds.
   -var 'key=value'       Variable for templates, can be used multiple times.
-  -var-file=path         JSON file containing user variables.
+  -var-file=path         JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ]
 `
 
 	return strings.TrimSpace(helpText)

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ Options:`
`419`	`419`	`-parallel-builds=1 Number of builds to run in parallel. 0 means no limit (Default: 0)`
`420`	`420`	`-timestamp-ui Enable prefixing of each ui output with an RFC3339 timestamp.`
`421`	`421`	`-var 'key=value' Variable for templates, can be used multiple times.`
`422`		`- -var-file=path JSON file containing user variables.`
	`422`	`+ -var-file=path JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ]`
`423`	`423`	`
`424`	`424`
`425`	`425`	`return strings.TrimSpace(helpText)`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ Usage: packer console [options] [TEMPLATE]`
`92`	`92`
`93`	`93`	`Options:`
`94`	`94`	`-var 'key=value' Variable for templates, can be used multiple times.`
`95`		`- -var-file=path JSON file containing user variables.`
	`95`	`+ -var-file=path JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ]`
`96`	`96`	`
`97`	`97`
`98`	`98`	`return strings.TrimSpace(helpText)`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ Options:`
`183`	`183`	`-except=foo,bar,baz Validate all builds other than these.`
`184`	`184`	`-only=foo,bar,baz Validate only these builds.`
`185`	`185`	`-var 'key=value' Variable for templates, can be used multiple times.`
`186`		`- -var-file=path JSON file containing user variables.`
	`186`	`+ -var-file=path JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ]`
`187`	`187`	`
`188`	`188`
`189`	`189`	`return strings.TrimSpace(helpText)`