Skip to content

Commit

Permalink
Fix typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
lzandman authored and lbajolet-hashicorp committed Mar 19, 2024
1 parent 7491d36 commit 65586bc
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ output:
# all available settings of specific linters
linters-settings:
errcheck:
# report about not checking of errors in type assetions: `a := b.(MyStruct)`;
# report about not checking of errors in type assertions: `a := b.(MyStruct)`;
# default is false: such cases aren't reported by default.
check-type-assertions: false

Expand Down
2 changes: 1 addition & 1 deletion .web-docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Config allows for various ways to authenticate Azure clients. When
one of the following: `client_secret`, `client_jwt`, `client_cert_path` --
Packer will use the specified Azure Active Directory (AAD) Service Principal
(SP).
If none ofthese options are specified, Packer will attempt to use the Managed Identity
If none of these options are specified, Packer will attempt to use the Managed Identity
and subscription of the VM that Packer is running on. This will only work if
Packer is running on an Azure VM with either a System Assigned Managed
Identity or User Assigned Managed Identity.
Expand Down
6 changes: 3 additions & 3 deletions .web-docs/components/builder/arm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ Providing `temp_resource_group_name` or `location` in combination with
- `azure_tag` ([]{name string, value string}) - Same as [`azure_tags`](#azure_tags) but defined as a singular repeatable block
containing a `name` and a `value` field. In HCL2 mode the
[`dynamic_block`](/packer/docs/templates/hcl_templates/expressions#dynamic-blocks)
will allow you to create those programatically.
will allow you to create those programmatically.

- `resource_group_name` (string) - Resource group under which the final artifact will be stored.

Expand Down Expand Up @@ -510,12 +510,12 @@ Providing `temp_resource_group_name` or `location` in combination with
`virtual_network_name` is not allowed.

- `boot_diag_storage_account` (string) - Specify storage to store Boot Diagnostics -- Enabling this option
will create 2 Files in the specified storage account. (serial console log & screehshot file)
will create 2 Files in the specified storage account. (serial console log & screenshot file)
once the build is completed, it has to be removed manually.
see [here](https://docs.microsoft.com/en-us/azure/virtual-machines/troubleshooting/boot-diagnostics) for more info

- `custom_resource_build_prefix` (string) - specify custom azure resource names during build limited to max 10 characters
this will set the prefix for the resources. The actuall resource names will be
this will set the prefix for the resources. The actual resource names will be
`custom_resource_build_prefix` + resourcetype + 5 character random alphanumeric string

- `license_type` (string) - Specify a license type for the build VM to enable Azure Hybrid Benefit. If not set, Pay-As-You-Go license
Expand Down
4 changes: 2 additions & 2 deletions .web-docs/components/builder/chroot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ information.
- `source` (string) - One of the following can be used as a source for an image:
- a shared image version resource ID
- a managed disk resource ID
- a publisher:offer:sku:version specifier for plaform image sources.
- a publisher:offer:sku:version specifier for platform image sources.

<!-- End of code generated from the comments of the Config struct in builder/azure/chroot/builder.go; -->

Expand Down Expand Up @@ -142,7 +142,7 @@ information.
provisioning. Defaults to `/etc/resolv.conf` so that DNS lookups work. Pass an empty list to skip copying
`/etc/resolv.conf`. You may need to do this if you're building an image that uses systemd.

- `os_disk_size_gb` (int64) - Try to resize the OS disk to this size on the first copy. Disks can only be englarged. If not specified,
- `os_disk_size_gb` (int64) - Try to resize the OS disk to this size on the first copy. Disks can only be enlarged. If not specified,
the disk will keep its original size. Required when using `from_scratch`

- `os_disk_storage_account_type` (string) - The [storage SKU](https://docs.microsoft.com/en-us/rest/api/compute/disks/createorupdate#diskstorageaccounttypes)
Expand Down
6 changes: 3 additions & 3 deletions builder/azure/arm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ type Config struct {
// Same as [`azure_tags`](#azure_tags) but defined as a singular repeatable block
// containing a `name` and a `value` field. In HCL2 mode the
// [`dynamic_block`](/packer/docs/templates/hcl_templates/expressions#dynamic-blocks)
// will allow you to create those programatically.
// will allow you to create those programmatically.
AzureTag config.NameValues `mapstructure:"azure_tag" required:"false"`
// Resource group under which the final artifact will be stored.
ResourceGroupName string `mapstructure:"resource_group_name"`
Expand Down Expand Up @@ -584,13 +584,13 @@ type Config struct {
AllowedInboundIpAddresses []string `mapstructure:"allowed_inbound_ip_addresses"`

// Specify storage to store Boot Diagnostics -- Enabling this option
// will create 2 Files in the specified storage account. (serial console log & screehshot file)
// will create 2 Files in the specified storage account. (serial console log & screenshot file)
// once the build is completed, it has to be removed manually.
// see [here](https://docs.microsoft.com/en-us/azure/virtual-machines/troubleshooting/boot-diagnostics) for more info
BootDiagSTGAccount string `mapstructure:"boot_diag_storage_account" required:"false"`

// specify custom azure resource names during build limited to max 10 characters
// this will set the prefix for the resources. The actuall resource names will be
// this will set the prefix for the resources. The actual resource names will be
// `custom_resource_build_prefix` + resourcetype + 5 character random alphanumeric string
CustomResourcePrefix string `mapstructure:"custom_resource_build_prefix" required:"false"`

Expand Down
2 changes: 1 addition & 1 deletion builder/azure/arm/step_deploy_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func deleteResource(ctx context.Context, client *AzureClient, subscriptionId str
return nil
}

// TODO Let's split this into two seperate methods
// TODO Let's split this into two separate methods
// deleteVHD and deleteManagedDisk, and then just check in Cleanup which function to call
func (s *StepDeployTemplate) deleteImage(ctx context.Context, imageName string, resourceGroupName string, isManagedDisk bool, subscriptionId string, storageAccountName string) error {
// Managed disk
Expand Down
4 changes: 2 additions & 2 deletions builder/azure/arm/step_get_ip_address.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ func (s *StepGetIPAddress) getPublicIP(ctx context.Context, subscriptionId strin
}

// TODO The interface name passed into getPublicIP has never done anything
// This code has been around for over 6 years so I'm hesistant to change it without more investigation so we should
// open a seperate GitHub issue for this when looking to merge the SDK branch
// This code has been around for over 6 years so I'm hesitant to change it without more investigation so we should
// open a separate GitHub issue for this when looking to merge the SDK branch
func (s *StepGetIPAddress) getPublicIPInPrivateNetwork(ctx context.Context, subscriptionId string, resourceGroupName string, ipAddressName string, interfaceName string) (string, error) {
return s.getPublicIP(ctx, subscriptionId, resourceGroupName, ipAddressName, interfaceName)
}
Expand Down
4 changes: 2 additions & 2 deletions builder/azure/arm/step_get_source_image_name_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ func TestStepGetSourceImageName(t *testing.T) {
CustomManagedImageName: "/subscription/1/resource/name",
// During build time the custom managed id source is resolved
// and stored as customManagedImageID
customManagedImageID: "/subscription/0/resource/mangedimage/12",
customManagedImageID: "/subscription/0/resource/managedimage/12",
},
expected: "/subscription/0/resource/mangedimage/12",
expected: "/subscription/0/resource/managedimage/12",
},
{
name: "MarketPlaceImage",
Expand Down
2 changes: 1 addition & 1 deletion builder/azure/arm/template_factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ func TestVirtualMachineDeploymentLicenseType01(t *testing.T) {
approvaltests.VerifyJSONStruct(t, deployment.Properties.Template)
}

// Ensure licenseType is set if specifed in config
// Ensure licenseType is set if specified in config
func TestVirtualMachineDeploymentLicenseType02(t *testing.T) {
var c Config
_, err := c.Prepare(getArmBuilderConfiguration(), getPackerConfiguration())
Expand Down
4 changes: 2 additions & 2 deletions builder/azure/chroot/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type Config struct {
// One of the following can be used as a source for an image:
// - a shared image version resource ID
// - a managed disk resource ID
// - a publisher:offer:sku:version specifier for plaform image sources.
// - a publisher:offer:sku:version specifier for platform image sources.
Source string `mapstructure:"source" required:"true"`
sourceType sourceType

Expand Down Expand Up @@ -87,7 +87,7 @@ type Config struct {
// `/etc/resolv.conf`. You may need to do this if you're building an image that uses systemd.
CopyFiles []string `mapstructure:"copy_files"`

// Try to resize the OS disk to this size on the first copy. Disks can only be englarged. If not specified,
// Try to resize the OS disk to this size on the first copy. Disks can only be enlarged. If not specified,
// the disk will keep its original size. Required when using `from_scratch`
OSDiskSizeGB int64 `mapstructure:"os_disk_size_gb"`
// The [storage SKU](https://docs.microsoft.com/en-us/rest/api/compute/disks/createorupdate#diskstorageaccounttypes)
Expand Down
2 changes: 1 addition & 1 deletion builder/azure/chroot/step_create_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestStepCreateImage_Run(t *testing.T) {
}

if len(*actualImage.Properties.StorageProfile.DataDisks) != 3 {
t.Fatalf("Expected 3 data disks attatched to created image got %d", len(*actualImage.Properties.StorageProfile.DataDisks))
t.Fatalf("Expected 3 data disks attached to created image got %d", len(*actualImage.Properties.StorageProfile.DataDisks))
}
if actualImage.Properties.StorageProfile.OsDisk.OsType != "Linux" {
t.Fatalf("Expected actual image to be Linux, got %s", actualImage.Properties.StorageProfile.OsDisk.OsType)
Expand Down
2 changes: 1 addition & 1 deletion builder/azure/chroot/step_get_source_image_name_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func TestChrootStepGetSourceImageName_SharedImage(t *testing.T) {
GeneratedData packerbuilderdata.GeneratedData
}{
{
name: "SharedImageWithMangedImageSource",
name: "SharedImageWithManagedImageSource",
SourceImageResourceID: "/subscriptions/1234/resourceGroups/bar/providers/Microsoft.Compute/galleries/test/images/foo/versions/1.0.6",
GeneratedData: genData,
mockedGalleryReturn: &galleryimageversions.GalleryImageVersion{
Expand Down
2 changes: 1 addition & 1 deletion builder/azure/common/client/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var NullModelSDKErr = fmt.Errorf("Unexpected SDK response, please open an issue
// one of the following: `client_secret`, `client_jwt`, `client_cert_path` --
// Packer will use the specified Azure Active Directory (AAD) Service Principal
// (SP).
// If none ofthese options are specified, Packer will attempt to use the Managed Identity
// If none of these options are specified, Packer will attempt to use the Managed Identity
// and subscription of the VM that Packer is running on. This will only work if
// Packer is running on an Azure VM with either a System Assigned Managed
// Identity or User Assigned Managed Identity.
Expand Down
6 changes: 3 additions & 3 deletions docs-partials/builder/azure/arm/Config-not-required.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
- `azure_tag` ([]{name string, value string}) - Same as [`azure_tags`](#azure_tags) but defined as a singular repeatable block
containing a `name` and a `value` field. In HCL2 mode the
[`dynamic_block`](/packer/docs/templates/hcl_templates/expressions#dynamic-blocks)
will allow you to create those programatically.
will allow you to create those programmatically.

- `resource_group_name` (string) - Resource group under which the final artifact will be stored.

Expand Down Expand Up @@ -369,12 +369,12 @@
`virtual_network_name` is not allowed.

- `boot_diag_storage_account` (string) - Specify storage to store Boot Diagnostics -- Enabling this option
will create 2 Files in the specified storage account. (serial console log & screehshot file)
will create 2 Files in the specified storage account. (serial console log & screenshot file)
once the build is completed, it has to be removed manually.
see [here](https://docs.microsoft.com/en-us/azure/virtual-machines/troubleshooting/boot-diagnostics) for more info

- `custom_resource_build_prefix` (string) - specify custom azure resource names during build limited to max 10 characters
this will set the prefix for the resources. The actuall resource names will be
this will set the prefix for the resources. The actual resource names will be
`custom_resource_build_prefix` + resourcetype + 5 character random alphanumeric string

- `license_type` (string) - Specify a license type for the build VM to enable Azure Hybrid Benefit. If not set, Pay-As-You-Go license
Expand Down
2 changes: 1 addition & 1 deletion docs-partials/builder/azure/chroot/Config-not-required.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
provisioning. Defaults to `/etc/resolv.conf` so that DNS lookups work. Pass an empty list to skip copying
`/etc/resolv.conf`. You may need to do this if you're building an image that uses systemd.

- `os_disk_size_gb` (int64) - Try to resize the OS disk to this size on the first copy. Disks can only be englarged. If not specified,
- `os_disk_size_gb` (int64) - Try to resize the OS disk to this size on the first copy. Disks can only be enlarged. If not specified,
the disk will keep its original size. Required when using `from_scratch`

- `os_disk_storage_account_type` (string) - The [storage SKU](https://docs.microsoft.com/en-us/rest/api/compute/disks/createorupdate#diskstorageaccounttypes)
Expand Down
2 changes: 1 addition & 1 deletion docs-partials/builder/azure/chroot/Config-required.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
- `source` (string) - One of the following can be used as a source for an image:
- a shared image version resource ID
- a managed disk resource ID
- a publisher:offer:sku:version specifier for plaform image sources.
- a publisher:offer:sku:version specifier for platform image sources.

<!-- End of code generated from the comments of the Config struct in builder/azure/chroot/builder.go; -->
2 changes: 1 addition & 1 deletion docs-partials/builder/azure/common/client/Config.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Config allows for various ways to authenticate Azure clients. When
one of the following: `client_secret`, `client_jwt`, `client_cert_path` --
Packer will use the specified Azure Active Directory (AAD) Service Principal
(SP).
If none ofthese options are specified, Packer will attempt to use the Managed Identity
If none of these options are specified, Packer will attempt to use the Managed Identity
and subscription of the VM that Packer is running on. This will only work if
Packer is running on an Azure VM with either a System Assigned Managed
Identity or User Assigned Managed Identity.
Expand Down
2 changes: 1 addition & 1 deletion provisioner/azure-dtlartifact/provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,6 @@ func (p *Provisioner) Provision(ctx context.Context, ui packersdk.Ui, comm packe
ui.Say(fmt.Sprintf("Error Applying artifact: %s", err))
}

ui.Say("Aftifact installed")
ui.Say("Artifact installed")
return err
}

0 comments on commit 65586bc

Please sign in to comment.