Merge pull request hashicorp#6013 from jsoref/spelling

Spelling

CHANGELOG.md

@@ -411,7 +411,7 @@
 * builder/cloudstack: Properly report back errors. [GH-5103] [GH-5123]
 * builder/docker: Fix windows filepath in docker-toolbox call [GH-4887]
 * builder/docker: Fix windows filepath in docker-toolbox call. [GH-4887]
-* builder/hyperv: Use SID to verify membersip in Admin group, fixing for non-
+* builder/hyperv: Use SID to verify membership in Admin group, fixing for non-
     english users. [GH-5022]
 * builder/hyperv: Verify membership in the group Hyper-V Administrators by SID
     not name. [GH-5022]
@@ -658,7 +658,7 @@
 * builder/amazon: Crashes when new EBS vols are used. [GH-4308]
 * builder/amazon: Fix crash in amazon-instance. [GH-4372]
 * builder/amazon: fix run volume tagging [GH-4420]
-* builder/amazon: fix when using non-existant security\_group\_id. [GH-4425]
+* builder/amazon: fix when using non-existent security\_group\_id. [GH-4425]
 * builder/amazon: Properly error if we don't have the
     ec2:DescribeSecurityGroups permission. [GH-4304]
 * builder/amazon: Properly wait for security group to exist. [GH-4369]
@@ -1321,7 +1321,7 @@
 * builder/parallels: Support Parallels Desktop 11. [GH-2199]
 * builder/openstack: Add `rackconnect_wait` for Rackspace customers to wait for
     RackConnect data to appear
-* buidler/openstack: Add `ssh_interface` option for rackconnect for users that
+* builder/openstack: Add `ssh_interface` option for rackconnect for users that
     have prohibitive firewalls
 * builder/openstack: Flavor names can be used as well as refs
 * builder/openstack: Add `availability_zone` [GH-2016]
@@ -1352,7 +1352,7 @@
 * core: Fix potential panic for post-processor plugin exits. [GH-2098]
 * core: `PACKER_CONFIG` may point to a non-existent file. [GH-2226]
 * builder/amazon: Allow spaces in AMI names when using `clean_ami_name` [GH-2182]
-* builder/amazon: Remove deprecated ec2-upload-bundle paramger. [GH-1931]
+* builder/amazon: Remove deprecated ec2-upload-bundle parameter. [GH-1931]
 * builder/amazon: Use IAM Profile to upload bundle if provided. [GH-1985]
 * builder/amazon: Use correct exit code after SSH authentication failed. [GH-2004]
 * builder/amazon: Retry finding created instance for eventual
@@ -1435,7 +1435,7 @@
 
 * builder/googlecompute: Support for ubuntu-os-cloud project
 * builder/googlecompute: Support for OAuth2 to avoid client secrets file
-* builder/googlecompute: GCE image from persistant disk instead of tarball
+* builder/googlecompute: GCE image from persistent disk instead of tarball
 * builder/qemu: Checksum type "none" can be used
 * provisioner/chef: Generate a node name if none available
 * provisioner/chef: Added ssl_verify_mode configuration
@@ -1569,7 +1569,7 @@
 * builder/docker: Can now specify login credentials to pull images.
 * builder/docker: Support mounting additional volumes. [GH-1430]
 * builder/parallels/all: Path to tools ISO is calculated automatically. [GH-1455]
-* builder/parallels-pvm: `reassign_mac` option to choose wehther or not
+* builder/parallels-pvm: `reassign_mac` option to choose whether or not
     to generate a new MAC address. [GH-1461]
 * builder/qemu: Can specify "none" acceleration type. [GH-1395]
 * builder/qemu: Can specify "tcg" acceleration type. [GH-1395]
@@ -1598,7 +1598,7 @@
     manager certs. [GH-1137]
 * builder/amazon/all: `delete_on_termination` set to false will work.
 * builder/amazon/all: Fix race condition on setting tags. [GH-1367]
-* builder/amazon/all: More desctriptive error messages if Amazon only
+* builder/amazon/all: More descriptive error messages if Amazon only
     sends an error code. [GH-1189]
 * builder/docker: Error if `DOCKER_HOST` is set.
 * builder/docker: Remove the container during cleanup. [GH-1206]
@@ -2012,7 +2012,7 @@
 * builder/digitalocean: scrub API keys from config debug output. [GH-516]
 * builder/virtualbox: error if VirtualBox version cant be detected. [GH-488]
 * builder/virtualbox: detect if vboxdrv isn't properly setup. [GH-488]
-* builder/virtualbox: sleep a bit before export to ensure the sesssion
+* builder/virtualbox: sleep a bit before export to ensure the session
     is unlocked. [GH-512]
 * builder/virtualbox: create SATA drives properly on VirtualBox 4.3. [GH-547]
 * builder/virtualbox: support user templates in SSH key path. [GH-539]
@@ -2169,7 +2169,7 @@
 * builder/virtualbox,vmware: Support SHA512 as a checksum type. [GH-356]
 * builder/vmware: The root hard drive type can now be specified with
     "disk_type_id" for advanced users. [GH-328]
-* provisioner/salt-masterless: Ability to specfy a minion config. [GH-264]
+* provisioner/salt-masterless: Ability to specify a minion config. [GH-264]
 * provisioner/salt-masterless: Ability to upload pillars. [GH-353]
 
 ### IMPROVEMENTS:
@@ -2228,7 +2228,7 @@
 * core: All HTTP downloads across Packer now support the standard
     proxy environmental variables (`HTTP_PROXY`, `NO_PROXY`, etc.) [GH-252]
 * builder/amazon: API requests will use HTTP proxy if specified by
-    enviromental variables.
+    environmental variables.
 * builder/digitalocean: API requests will use HTTP proxy if specified
     by environmental variables.
 
@@ -2274,11 +2274,11 @@
 * builder/amazon-instance: send IAM instance profile data. [GH-294]
 * builder/digitalocean: API request parameters are properly URL
     encoded. [GH-281]
-* builder/virtualbox: dowload progress won't be shown until download
+* builder/virtualbox: download progress won't be shown until download
     actually starts. [GH-288]
 * builder/virtualbox: floppy files names of 13 characters are now properly
     written to the FAT12 filesystem. [GH-285]
-* builder/vmware: dowload progress won't be shown until download
+* builder/vmware: download progress won't be shown until download
     actually starts. [GH-288]
 * builder/vmware: interrupt works while typing commands over VNC.
 * builder/virtualbox: floppy files names of 13 characters are now properly
@@ -2400,7 +2400,7 @@
 ### BUG FIXES:
 
 * builder/amazon/all: Gracefully handle when AMI appears to not exist
-    while AWS state is propogating. [GH-207]
+    while AWS state is propagating. [GH-207]
 * builder/virtualbox: Trim carriage returns for Windows to properly
     detect VM state on Windows. [GH-218]
 * core: build names no longer cause invalid config errors. [GH-197]
@@ -2425,7 +2425,7 @@
 * Amazon EBS builder can now optionally use a pre-made security group
     instead of randomly generating one.
 * DigitalOcean API key and client IDs can now be passed in as
-    environmental variables. See the documentatin for more details.
+    environmental variables. See the documentation for more details.
 * VirtualBox and VMware can now have `floppy_files` specified to attach
     floppy disks when booting. This allows for unattended Windows installs.
 * `packer build` has a new `-force` flag that forces the removal of
@@ -2482,7 +2482,7 @@
 * core: Non-200 response codes on downloads now show proper errors.
     [GH-141]
 * amazon-ebs: SSH handshake is retried. [GH-130]
-* vagrant: The `BuildName` template propery works properly in
+* vagrant: The `BuildName` template property works properly in
     the output path.
 * vagrant: Properly configure the provider-specific post-processors so
     things like `vagrantfile_template` work. [GH-129]

builder/alicloud/ecs/builder.go

@@ -89,7 +89,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 	steps = []multistep.Step{
 		&stepPreValidate{
 			AlicloudDestImageName: b.config.AlicloudImageName,
-			ForceDelete:           b.config.AlicloudImageForceDetele,
+			ForceDelete:           b.config.AlicloudImageForceDelete,
 		},
 		&stepCheckAlicloudSourceImage{
 			SourceECSImageId: b.config.AlicloudSourceImage,
@@ -132,7 +132,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			RegionId:                b.config.AlicloudRegion,
 			InternetChargeType:      b.config.InternetChargeType,
 			InternetMaxBandwidthOut: b.config.InternetMaxBandwidthOut,
-			InstnaceName:            b.config.InstanceName,
+			InstanceName:            b.config.InstanceName,
 			ZoneId:                  b.config.ZoneId,
 		})
 	if b.chooseNetworkType() == VpcNet {
@@ -165,8 +165,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			ForceStop: b.config.ForceStopInstance,
 		},
 		&stepDeleteAlicloudImageSnapshots{
-			AlicloudImageForceDeteleSnapshots: b.config.AlicloudImageForceDeteleSnapshots,
-			AlicloudImageForceDetele:          b.config.AlicloudImageForceDetele,
+			AlicloudImageForceDeleteSnapshots: b.config.AlicloudImageForceDeleteSnapshots,
+			AlicloudImageForceDelete:          b.config.AlicloudImageForceDelete,
 			AlicloudImageName:                 b.config.AlicloudImageName,
 		},
 		&stepCreateAlicloudImage{},

builder/alicloud/ecs/image_config.go

@@ -32,8 +32,8 @@ type AlicloudImageConfig struct {
 	AlicloudImageUNShareAccounts      []string `mapstructure:"image_unshare_account"`
 	AlicloudImageDestinationRegions   []string `mapstructure:"image_copy_regions"`
 	AlicloudImageDestinationNames     []string `mapstructure:"image_copy_names"`
-	AlicloudImageForceDetele          bool     `mapstructure:"image_force_delete"`
-	AlicloudImageForceDeteleSnapshots bool     `mapstructure:"image_force_delete_snapshots"`
+	AlicloudImageForceDelete          bool     `mapstructure:"image_force_delete"`
+	AlicloudImageForceDeleteSnapshots bool     `mapstructure:"image_force_delete_snapshots"`
 	AlicloudImageForceDeleteInstances bool     `mapstructure:"image_force_delete_instances"`
 	AlicloudImageSkipRegionValidation bool     `mapstructure:"skip_region_validation"`
 	AlicloudDiskDevices               `mapstructure:",squash"`

builder/alicloud/ecs/run_config.go

@@ -57,7 +57,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 	}
 
 	if c.InstanceType == "" {
-		errs = append(errs, errors.New("An aliclod_instance_type must be specified"))
+		errs = append(errs, errors.New("An alicloud_instance_type must be specified"))
 	}
 
 	if c.UserData != "" && c.UserDataFile != "" {

builder/alicloud/ecs/step_config_public_ip.go

@@ -10,8 +10,8 @@ import (
 )
 
 type stepConfigAlicloudPublicIP struct {
-	publicIPAdress string
-	RegionId       string
+	publicIPAddress string
+	RegionId        string
 }
 
 func (s *stepConfigAlicloudPublicIP) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
@@ -25,7 +25,7 @@ func (s *stepConfigAlicloudPublicIP) Run(_ context.Context, state multistep.Stat
 		ui.Say(fmt.Sprintf("Error allocating public ip: %s", err))
 		return multistep.ActionHalt
 	}
-	s.publicIPAdress = ipaddress
+	s.publicIPAddress = ipaddress
 	ui.Say(fmt.Sprintf("Allocated public ip address %s.", ipaddress))
 	state.Put("ipaddress", ipaddress)
 	return multistep.ActionContinue

builder/alicloud/ecs/step_config_vswitch.go

@@ -137,7 +137,7 @@ func (s *stepConfigAlicloudVSwitch) Cleanup(state multistep.StateBag) {
 			e, _ := err.(*common.Error)
 			if (e.Code == "IncorrectVSwitchStatus" || e.Code == "DependencyViolation" ||
 				e.Code == "DependencyViolation.HaVip" ||
-				e.Code == "IncorretRouteEntryStatus") && time.Now().Before(timeoutPoint) {
+				e.Code == "IncorrectRouteEntryStatus") && time.Now().Before(timeoutPoint) {
 				time.Sleep(1 * time.Second)
 				continue
 			}

builder/alicloud/ecs/step_create_instance.go

@@ -21,7 +21,7 @@ type stepCreateAlicloudInstance struct {
 	RegionId                string
 	InternetChargeType      string
 	InternetMaxBandwidthOut int
-	InstnaceName            string
+	InstanceName            string
 	ZoneId                  string
 	instance                *ecs.InstanceAttributesType
 }
@@ -63,7 +63,7 @@ func (s *stepCreateAlicloudInstance) Run(_ context.Context, state multistep.Stat
 			IoOptimized:             ioOptimized,
 			VSwitchId:               vswitchId,
 			SecurityGroupId:         securityGroupId,
-			InstanceName:            s.InstnaceName,
+			InstanceName:            s.InstanceName,
 			Password:                password,
 			ZoneId:                  s.ZoneId,
 			DataDisk:                diskDeviceToDiskType(config.AlicloudImageConfig.ECSImagesDiskMappings),
@@ -89,7 +89,7 @@ func (s *stepCreateAlicloudInstance) Run(_ context.Context, state multistep.Stat
 			InternetMaxBandwidthOut: s.InternetMaxBandwidthOut,
 			IoOptimized:             ioOptimized,
 			SecurityGroupId:         securityGroupId,
-			InstanceName:            s.InstnaceName,
+			InstanceName:            s.InstanceName,
 			Password:                password,
 			ZoneId:                  s.ZoneId,
 			DataDisk:                diskDeviceToDiskType(config.AlicloudImageConfig.ECSImagesDiskMappings),

builder/alicloud/ecs/step_delete_images_snapshots.go

@@ -12,8 +12,8 @@ import (
 )
 
 type stepDeleteAlicloudImageSnapshots struct {
-	AlicloudImageForceDetele          bool
-	AlicloudImageForceDeteleSnapshots bool
+	AlicloudImageForceDelete          bool
+	AlicloudImageForceDeleteSnapshots bool
 	AlicloudImageName                 string
 }
 
@@ -23,7 +23,7 @@ func (s *stepDeleteAlicloudImageSnapshots) Run(_ context.Context, state multiste
 	config := state.Get("config").(Config)
 	ui.Say("Deleting image snapshots.")
 	// Check for force delete
-	if s.AlicloudImageForceDetele {
+	if s.AlicloudImageForceDelete {
 		images, _, err := client.DescribeImages(&ecs.DescribeImagesArgs{
 			RegionId:  common.Region(config.AlicloudRegion),
 			ImageName: s.AlicloudImageName,
@@ -43,7 +43,7 @@ func (s *stepDeleteAlicloudImageSnapshots) Run(_ context.Context, state multiste
 				ui.Error(err.Error())
 				return multistep.ActionHalt
 			}
-			if s.AlicloudImageForceDeteleSnapshots {
+			if s.AlicloudImageForceDeleteSnapshots {
 				for _, diskDevice := range image.DiskDeviceMappings.DiskDeviceMapping {
 					if err := client.DeleteSnapshot(diskDevice.SnapshotId); err != nil {
 						err := fmt.Errorf("Deleting ECS snapshot failed: %s", err)

builder/alicloud/ecs/step_run_instance.go

@@ -43,8 +43,8 @@ func (s *stepRunAlicloudInstance) Cleanup(state multistep.StateBag) {
 		ui := state.Get("ui").(packer.Ui)
 		client := state.Get("client").(*ecs.Client)
 		instance := state.Get("instance").(*ecs.InstanceAttributesType)
-		instanceAttrubite, _ := client.DescribeInstanceAttribute(instance.InstanceId)
-		if instanceAttrubite.Status == ecs.Starting || instanceAttrubite.Status == ecs.Running {
+		instanceAttribute, _ := client.DescribeInstanceAttribute(instance.InstanceId)
+		if instanceAttribute.Status == ecs.Starting || instanceAttribute.Status == ecs.Running {
 			if err := client.StopInstance(instance.InstanceId, true); err != nil {
 				ui.Say(fmt.Sprintf("Error stopping instance %s, it may still be around %s", instance.InstanceId, err))
 				return

builder/amazon/common/access_config_test.go

@@ -42,7 +42,7 @@ func TestAccessConfigPrepare_Region(t *testing.T) {
 
 }
 
-func TestAccessConfigPrepare_RegionRestrictd(t *testing.T) {
+func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {
 	c := testAccessConfig()
 
 	// Create a Session with a custom region

builder/amazon/common/run_config.go

@@ -78,7 +78,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 	// Validation
 	errs := c.Comm.Prepare(ctx)
 
-	// Valadating ssh_interface
+	// Validating ssh_interface
 	if c.SSHInterface != "public_ip" &&
 		c.SSHInterface != "private_ip" &&
 		c.SSHInterface != "public_dns" &&

builder/azure/arm/artifact_test.go

@@ -235,7 +235,7 @@ func TestAdditionalDiskArtifactProperties(t *testing.T) {
 	}
 }
 
-func TestArtifactOverHypenatedCaptureUri(t *testing.T) {
+func TestArtifactOverHyphenatedCaptureUri(t *testing.T) {
 	template := CaptureTemplate{
 		Resources: []CaptureResources{
 			{

builder/azure/arm/authenticate_test.go

@@ -8,7 +8,7 @@ import (
 
 // Behavior is the most important thing to assert for ServicePrincipalToken, but
 // that cannot be done in a unit test because it involves network access.  Instead,
-// I assert the expected intertness of this class.
+// I assert the expected inertness of this class.
 func TestNewAuthenticate(t *testing.T) {
 	testSubject := NewAuthenticate(azure.PublicCloud, "clientID", "clientString", "tenantID")
 	spn, err := testSubject.getServicePrincipalToken()

builder/azure/arm/azure_error_response_test.go

@@ -12,16 +12,16 @@ const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Res
 const AzureErrorNested = `{"status":"Failed","error":{"code":"DeploymentFailed","message":"At least one resource deployment operation failed. Please list deployment operations for details. Please see https://aka.ms/arm-debug for usage details.","details":[{"code":"BadRequest","message":"{\r\n  \"error\": {\r\n    \"code\": \"InvalidRequestFormat\",\r\n    \"message\": \"Cannot parse the request.\",\r\n    \"details\": [\r\n      {\r\n        \"code\": \"InvalidJson\",\r\n        \"message\": \"Error converting value \\\"playground\\\" to type 'Microsoft.WindowsAzure.Networking.Nrp.Frontend.Contract.Csm.Public.IpAllocationMethod'. Path 'properties.publicIPAllocationMethod', line 1, position 130.\"\r\n      }\r\n    ]\r\n  }\r\n}"}]}}`
 
 func TestAzureErrorSimpleShouldUnmarshal(t *testing.T) {
-	var azureErrorReponse azureErrorResponse
-	err := json.Unmarshal([]byte(AzureErrorSimple), &azureErrorReponse)
+	var azureErrorResponse azureErrorResponse
+	err := json.Unmarshal([]byte(AzureErrorSimple), &azureErrorResponse)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if azureErrorReponse.ErrorDetails.Code != "ResourceNotFound" {
+	if azureErrorResponse.ErrorDetails.Code != "ResourceNotFound" {
 		t.Errorf("Error.Code")
 	}
-	if azureErrorReponse.ErrorDetails.Message != "The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found." {
+	if azureErrorResponse.ErrorDetails.Message != "The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found." {
 		t.Errorf("Error.Message")
 	}
 }
@@ -51,26 +51,26 @@ func TestAzureErrorEmptyShouldFormat(t *testing.T) {
 }
 
 func TestAzureErrorSimpleShouldFormat(t *testing.T) {
-	var azureErrorReponse azureErrorResponse
-	err := json.Unmarshal([]byte(AzureErrorSimple), &azureErrorReponse)
+	var azureErrorResponse azureErrorResponse
+	err := json.Unmarshal([]byte(AzureErrorSimple), &azureErrorResponse)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = approvaltests.VerifyString(t, azureErrorReponse.Error())
+	err = approvaltests.VerifyString(t, azureErrorResponse.Error())
 	if err != nil {
 		t.Fatal(err)
 	}
 }
 
 func TestAzureErrorNestedShouldFormat(t *testing.T) {
-	var azureErrorReponse azureErrorResponse
-	err := json.Unmarshal([]byte(AzureErrorNested), &azureErrorReponse)
+	var azureErrorResponse azureErrorResponse
+	err := json.Unmarshal([]byte(AzureErrorNested), &azureErrorResponse)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = approvaltests.VerifyString(t, azureErrorReponse.Error())
+	err = approvaltests.VerifyString(t, azureErrorResponse.Error())
 	if err != nil {
 		t.Fatal(err)
 	}

builder/azure/arm/config.go

@@ -418,7 +418,7 @@ func setCloudEnvironment(c *Config) error {
 	name := strings.ToUpper(c.CloudEnvironmentName)
 	envName, ok := lookup[name]
 	if !ok {
-		return fmt.Errorf("There is no cloud envionment matching the name '%s'!", c.CloudEnvironmentName)
+		return fmt.Errorf("There is no cloud environment matching the name '%s'!", c.CloudEnvironmentName)
 	}
 
 	env, err := azure.EnvironmentFromName(envName)