From a81811663af2c82d36062ea3b34941ddf3bfc422 Mon Sep 17 00:00:00 2001 From: Peter Willis <47869351+pwillis-els@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:52:17 -0400 Subject: [PATCH 1/2] Fix typos --- command/hcl2_upgrade.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index b9e7f7225..9da3dc645 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -55,7 +55,7 @@ func (c *HCL2UpgradeCommand) ParseArgs(args []string) (*HCL2UpgradeArgs, int) { } const ( - hcl2UpgradeFileHeader = `# This file was autogenerate by the BETA 'packer hcl2_upgrade' command. We + hcl2UpgradeFileHeader = `# This file was autogenerated by the BETA 'packer hcl2_upgrade' command. We # recommend double checking that everything is correct before going forward. We # also recommend treating this file as disposable. The HCL2 blocks in this # file can be moved to other files. For example, the variable blocks could be @@ -64,20 +64,20 @@ const ( # once they also need to be in the same folder. 'packer inspect folder/' # will describe to you what is in that folder. -# All generated input variables will be of string type as this how Packer JSON -# views them; you can later on change their type. Read the variables type +# All generated input variables will be of 'string' type as this is how Packer JSON +# views them; you can change their type later on. Read the variables type # constraints documentation # https://www.packer.io/docs/from-1.5/variables#type-constraints for more info. ` sourcesHeader = ` # source blocks are generated from your builders; a source can be referenced in -# build blocks. A build block runs provisioner and post-processors onto a +# build blocks. A build block runs provisioner and post-processors on a # source. Read the documentation for source blocks here: # https://www.packer.io/docs/from-1.5/blocks/source` buildHeader = ` -# a build block invokes sources and runs provisionning steps on them. The +# a build block invokes sources and runs provisioning steps on them. The # documentation for build blocks can be found here: # https://www.packer.io/docs/from-1.5/blocks/build build { @@ -413,14 +413,14 @@ func (*HCL2UpgradeCommand) Help() string { helpText := ` Usage: packer hcl2_upgrade -output-file=JSON_TEMPLATE.pkr.hcl JSON_TEMPLATE... - Will transform your JSON template to a HCL2 configuration. + Will transform your JSON template into an HCL2 configuration. ` return strings.TrimSpace(helpText) } func (*HCL2UpgradeCommand) Synopsis() string { - return "transform a JSON template into a HCL2 configuration" + return "transform a JSON template into an HCL2 configuration" } func (*HCL2UpgradeCommand) AutocompleteArgs() complete.Predictor { From f1b57b1e66e55501ead8c7414cf0630c30c4df55 Mon Sep 17 00:00:00 2001 From: Peter Willis <47869351+pwillis-els@users.noreply.github.com> Date: Wed, 14 Oct 2020 15:04:18 -0400 Subject: [PATCH 2/2] Fix typos --- .../test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl index ac2dfe32b..ffb88fd7c 100644 --- a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl +++ b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl @@ -1,4 +1,4 @@ -# This file was autogenerate by the BETA 'packer hcl2_upgrade' command. We +# This file was autogenerated by the BETA 'packer hcl2_upgrade' command. We # recommend double checking that everything is correct before going forward. We # also recommend treating this file as disposable. The HCL2 blocks in this # file can be moved to other files. For example, the variable blocks could be @@ -7,8 +7,8 @@ # once they also need to be in the same folder. 'packer inspect folder/' # will describe to you what is in that folder. -# All generated input variables will be of string type as this how Packer JSON -# views them; you can later on change their type. Read the variables type +# All generated input variables will be of 'string' type as this is how Packer JSON +# views them; you can change their type later on. Read the variables type # constraints documentation # https://www.packer.io/docs/from-1.5/variables#type-constraints for more info. variable "aws_access_key" { @@ -31,7 +31,7 @@ variable "aws_secret_key" { locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") } # source blocks are generated from your builders; a source can be referenced in -# build blocks. A build block runs provisioner and post-processors onto a +# build blocks. A build block runs provisioner and post-processors on a # source. Read the documentation for source blocks here: # https://www.packer.io/docs/from-1.5/blocks/source source "amazon-ebs" "autogenerated_1" { @@ -70,7 +70,7 @@ source "amazon-ebs" "autogenerated_1" { } } -# a build block invokes sources and runs provisionning steps on them. The +# a build block invokes sources and runs provisioning steps on them. The # documentation for build blocks can be found here: # https://www.packer.io/docs/from-1.5/blocks/build build {