From d34f77d492da1c42e4ac8ef86b7160b8af8dad20 Mon Sep 17 00:00:00 2001 From: Leon Zandman Date: Wed, 16 Oct 2024 10:15:26 +0200 Subject: [PATCH] Reverted files based on Pull Request comment. --- builder/azure/chroot/shared_image_gallery_destination.go | 4 ++-- .../azure/chroot/shared_image_gallery_destination.hcl2spec.go | 4 ++-- builder/azure/chroot/shared_image_gallery_destination_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/azure/chroot/shared_image_gallery_destination.go b/builder/azure/chroot/shared_image_gallery_destination.go index 9d3d35d2..0980a40d 100644 --- a/builder/azure/chroot/shared_image_gallery_destination.go +++ b/builder/azure/chroot/shared_image_gallery_destination.go @@ -21,7 +21,7 @@ type SharedImageGalleryDestination struct { TargetRegions []TargetRegion `mapstructure:"target_regions"` ExcludeFromLatest bool `mapstructure:"exclude_from_latest"` - ExcludeFromLatestTypo bool `mapstructure:"exclude_from_latest" undocumented:"true"` + ExcludeFromLatestTypo bool `mapstructure:"exlude_from_latest" undocumented:"true"` } // TargetRegion describes a region where the shared image should be replicated @@ -67,7 +67,7 @@ func (sigd *SharedImageGalleryDestination) Validate(prefix string) (errs []error } if sigd.ExcludeFromLatestTypo == true && sigd.ExcludeFromLatest == false { warns = append(warns, - fmt.Sprintf("%s.exclude_from_latest is being deprecated, please use exclude_from_latest", prefix)) + fmt.Sprintf("%s.exlude_from_latest is being deprecated, please use exclude_from_latest", prefix)) sigd.ExcludeFromLatest = sigd.ExcludeFromLatestTypo } return diff --git a/builder/azure/chroot/shared_image_gallery_destination.hcl2spec.go b/builder/azure/chroot/shared_image_gallery_destination.hcl2spec.go index de1dc32c..7ffd151d 100644 --- a/builder/azure/chroot/shared_image_gallery_destination.hcl2spec.go +++ b/builder/azure/chroot/shared_image_gallery_destination.hcl2spec.go @@ -16,7 +16,7 @@ type FlatSharedImageGalleryDestination struct { ImageVersion *string `mapstructure:"image_version" required:"true" cty:"image_version" hcl:"image_version"` TargetRegions []FlatTargetRegion `mapstructure:"target_regions" cty:"target_regions" hcl:"target_regions"` ExcludeFromLatest *bool `mapstructure:"exclude_from_latest" cty:"exclude_from_latest" hcl:"exclude_from_latest"` - ExcludeFromLatestTypo *bool `mapstructure:"exclude_from_latest" undocumented:"true" cty:"exclude_from_latest" hcl:"exclude_from_latest"` + ExcludeFromLatestTypo *bool `mapstructure:"exlude_from_latest" undocumented:"true" cty:"exlude_from_latest" hcl:"exlude_from_latest"` } // FlatMapstructure returns a new FlatSharedImageGalleryDestination. @@ -37,7 +37,7 @@ func (*FlatSharedImageGalleryDestination) HCL2Spec() map[string]hcldec.Spec { "image_version": &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false}, "target_regions": &hcldec.BlockListSpec{TypeName: "target_regions", Nested: hcldec.ObjectSpec((*FlatTargetRegion)(nil).HCL2Spec())}, "exclude_from_latest": &hcldec.AttrSpec{Name: "exclude_from_latest", Type: cty.Bool, Required: false}, - "exclude_from_latest": &hcldec.AttrSpec{Name: "exclude_from_latest", Type: cty.Bool, Required: false}, + "exlude_from_latest": &hcldec.AttrSpec{Name: "exlude_from_latest", Type: cty.Bool, Required: false}, } return s } diff --git a/builder/azure/chroot/shared_image_gallery_destination_test.go b/builder/azure/chroot/shared_image_gallery_destination_test.go index d2d047d5..7c9cd7f7 100644 --- a/builder/azure/chroot/shared_image_gallery_destination_test.go +++ b/builder/azure/chroot/shared_image_gallery_destination_test.go @@ -71,7 +71,7 @@ func TestSharedImageGalleryDestination_Validate(t *testing.T) { wantWarns: []string{"sigdest.target_regions is empty; image will only be available in the region of the gallery"}, }, { - name: "warn if using exclude_from_latest", + name: "warn if using exlude_from_latest", fields: fields{ ResourceGroup: "ResourceGroup", GalleryName: "GalleryName", @@ -91,7 +91,7 @@ func TestSharedImageGalleryDestination_Validate(t *testing.T) { }, ExcludeFromLatestTypo: true, }, - wantWarns: []string{"sigdest.exclude_from_latest is being deprecated, please use exclude_from_latest"}, + wantWarns: []string{"sigdest.exlude_from_latest is being deprecated, please use exclude_from_latest"}, }, { name: "version format",