Merge pull request #577 from hashicorp/backport-2.5.2

Backport Release v2.5.2

Author: tanmay-hc

.github/workflows/acceptance-tests.yaml

@@ -81,11 +81,31 @@ jobs:
           echo "ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID}}" >> $GITHUB_ENV
           echo "ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID}}" >> $GITHUB_ENV
           echo "ARM_CLIENT_SECRET=${{ secrets.ARM_CLIENT_SECRET}}" >> $GITHUB_ENV
-          echo "ARM_RESOURCE_GROUP_NAME=packercigroup" >> $GITHUB_ENV
-          echo "ARM_STORAGE_ACCOUNT=packerciaccount" >> $GITHUB_ENV
-          echo "ARM_RESOURCE_PREFIX=packerci" >> $GITHUB_ENV
+          BASE_RG="packercigroup"
+          BASE_STORAGE="packerciaccount"
+          BASE_PREFIX="packerci"
+          SUFFIX=$(printf "%s" "${GITHUB_RUN_ID}" | tail -c 6)
+          STORAGE_BASE=$(echo "${BASE_STORAGE}" | tr '[:upper:]' '[:lower:]' | tr -d '-')
+          MAX_STORAGE_LEN=$((24 - ${#SUFFIX}))
+          STORAGE_BASE=${STORAGE_BASE:0:${MAX_STORAGE_LEN}}
+
+          echo "ARM_RESOURCE_GROUP_NAME_BASE=${BASE_RG}" >> $GITHUB_ENV
+          echo "ARM_STORAGE_ACCOUNT_BASE=${BASE_STORAGE}" >> $GITHUB_ENV
+          echo "ARM_RESOURCE_PREFIX_BASE=${BASE_PREFIX}" >> $GITHUB_ENV
+          echo "ARM_RESOURCE_SUFFIX=${SUFFIX}" >> $GITHUB_ENV
+
+          echo "ARM_RESOURCE_GROUP_NAME=${BASE_RG}-${SUFFIX}" >> $GITHUB_ENV
+          echo "ARM_STORAGE_ACCOUNT=${STORAGE_BASE}${SUFFIX}" >> $GITHUB_ENV
+          echo "ARM_RESOURCE_PREFIX=${BASE_PREFIX}_${SUFFIX}" >> $GITHUB_ENV
+          echo "ARM_STORAGE_CONTAINER_NAME=packeracc" >> $GITHUB_ENV
+          echo "ARM_TEMP_RESOURCE_GROUP_NAME=${BASE_PREFIX}-${SUFFIX}-acceptance-test-managed-cli" >> $GITHUB_ENV
           echo "ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }}" >> $GITHUB_ENV
 
+          KV_BASE=$(echo "${BASE_PREFIX}" | tr '[:upper:]' '[:lower:]' | tr -d '-' | tr -d '_')
+          KV_BASE_MAX=$((24 - ${#SUFFIX} - 2))
+          KV_BASE=${KV_BASE:0:${KV_BASE_MAX}}
+          echo "ARM_KEY_VAULT_NAME=${KV_BASE}kv${SUFFIX}" >> $GITHUB_ENV
+
           OBJECT_ID=$(az ad sp show --id "${{ secrets.ARM_CLIENT_ID }}" | jq -r '.id')
           echo "AZURE_OBJECT_ID=${OBJECT_ID}" >> $GITHUB_ENV
 

CHANGELOG.md

@@ -3,6 +3,23 @@
 Please refer to [releases](https://github.com/hashicorp/packer-plugin-azure/releases) for the latest CHANGELOG information.
 
 ---
+## 2.5.2 (February 4, 2026)
+
+## What's Changed
+### Exciting New Features
+
+### Bug Fixes
+* BUG: Updates tests for permissions and polling [GH-572](https://github.com/hashicorp/packer-plugin-azure/pull/572)
+
+### Other Changes
+* Adds dynamic resource name suffixing for isolation of Acceptance tests [GH-575](https://github.com/hashicorp/packer-plugin-azure/pull/575)
+* Updates Go version to 1.24.12 in module file [GH-573](https://github.com/hashicorp/packer-plugin-azure/pull/573)
+* Fix various lint warnings. [GH-566](https://github.com/hashicorp/packer-plugin-azure/pull/566)
+* Staticcheck/QF1003: Replace if-else with switch-case for OSType checks. [GH-565](https://github.com/hashicorp/packer-plugin-azure/pull/565)
+* Replace deprecated ui.Message with ui.Say [GH-564](https://github.com/hashicorp/packer-plugin-azure/pull/564)
+
+**Full Changelog**: https://github.com/hashicorp/packer-plugin-azure/compare/v2.5.1...v2.5.2
+
 ## 2.5.1 (December 18, 2025)
 
 ## What's Changed

README.md

@@ -19,7 +19,7 @@ Then, run [`packer init`](https://www.packer.io/docs/commands/init).
 packer {
   required_plugins {
     azure = {
-      version = ">= 2.5.1"
+      version = ">= 2.5.2"
       source  = "github.com/hashicorp/azure"
     }
   }

builder/azure/arm/artifact_test.go

@@ -258,7 +258,6 @@ SharedImageGalleryReplicatedRegions: fake-region-1, fake-region-2
 		"sig_replicated_regions",
 	}
 	for _, key := range expectedSIGLabels {
-		key := key
 		v, ok := image.Labels[key]
 		if !ok {
 			t.Errorf("expected labels to have %q but no entry was found", key)
@@ -352,7 +351,6 @@ SharedImageGalleryReplicatedRegions: fake-region-1, fake-region-2
 		"sig_replicated_regions",
 	}
 	for _, key := range expectedSIGLabels {
-		key := key
 		v, ok := image.Labels[key]
 		if !ok {
 			t.Errorf("expected labels to have %q but no entry was found", key)

builder/azure/arm/builder.go

@@ -120,7 +120,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		OidcRequestToken:   b.config.ClientConfig.OidcRequestToken,
 	}
 
-	ui.Message("Creating Azure Resource Manager (ARM) client ...")
+	ui.Say("Creating Azure Resource Manager (ARM) client ...")
 	azureClient, err := NewAzureClient(
 		ctx,
 		b.config.StorageAccount,
@@ -132,7 +132,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 	if err != nil {
 		return nil, err
 	}
-	ui.Message("ARM Client successfully created")
+	ui.Say("ARM Client successfully created")
 
 	resolver := newResourceResolver(azureClient)
 	if err := resolver.Resolve(&b.config); err != nil {
@@ -145,7 +145,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 	if b.config.ClientConfig.ObjectID == "" {
 		b.config.ClientConfig.ObjectID = objectID
 	} else {
-		ui.Message("You have provided Object_ID which is no longer needed, Azure Packer ARM builder determines this automatically using the Azure Access Token")
+		ui.Say("You have provided Object_ID which is no longer needed, Azure Packer ARM builder determines this automatically using the Azure Access Token")
 	}
 
 	if b.config.ClientConfig.ObjectID == "" && b.config.OSType != constants.Target_Linux {
@@ -155,7 +155,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 	// If the user is bringing their own vnet, don't warn, if its an invalid SKU it will get disabled at a different date and Microsoft will send out warings
 	if b.config.VirtualNetworkName == "" {
 		if b.config.PublicIpSKU == string(publicipaddresses.PublicIPAddressSkuNameBasic) {
-			ui.Message(publicIPWarning)
+			ui.Say(publicIPWarning)
 		}
 	}
 
@@ -422,7 +422,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		}
 
 		if b.config.SkipCreateBuildKeyVault {
-			ui.Message("Skipping build keyvault creation...")
+			ui.Say("Skipping build keyvault creation...")
 		} else if b.config.BuildKeyVaultName == "" {
 			keyVaultDeploymentName := b.stateBag.Get(constants.ArmKeyVaultDeploymentName).(string)
 			steps = append(steps,
@@ -513,12 +513,12 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 	steps = append(steps, captureSteps...)
 
 	if b.config.PackerDebug {
-		ui.Message(fmt.Sprintf("temp admin user: '%s'", b.config.UserName))
-		ui.Message(fmt.Sprintf("temp admin password: '%s'", b.config.Password))
+		ui.Say(fmt.Sprintf("temp admin user: '%s'", b.config.UserName))
+		ui.Say(fmt.Sprintf("temp admin password: '%s'", b.config.Password))
 
 		if len(b.config.Comm.SSHPrivateKey) != 0 {
 			debugKeyPath := fmt.Sprintf("%s-%s.pem", b.config.PackerBuildName, b.config.tmpComputeName)
-			ui.Message(fmt.Sprintf("temp ssh key: %s", debugKeyPath))
+			ui.Say(fmt.Sprintf("temp ssh key: %s", debugKeyPath))
 
 			b.writeSSHPrivateKey(ui, debugKeyPath)
 		}
@@ -782,7 +782,7 @@ func (b *Builder) getVHDArtifact(vhdArtifact *VHDArtifact) {
 	additionalDiskCount := len(b.config.AdditionalDiskSize)
 	if additionalDiskCount > 0 {
 		dataDisks := make([]AdditionalDiskArtifact, additionalDiskCount)
-		for i := 0; i < additionalDiskCount; i++ {
+		for i := range additionalDiskCount {
 			dataDisks[i].AdditionalDiskUri = fmt.Sprintf("%s%s/%s%s-%d.vhd",
 				b.config.storageAccountBlobEndpoint, b.config.CaptureContainerName, b.config.CaptureNamePrefix, b.config.tmpDataDiskName, i+1)
 		}

builder/azure/arm/builder_acc_test.go

@@ -19,6 +19,8 @@ package arm
 // ** ARM_RESOURCE_GROUP_NAME - Resource group
 // ** ARM_STORAGE_ACCOUNT - a storage account located in above resource group
 // ** ARM_RESOURCE_PREFIX - String prefix for resources unique name constraints
+// ** ARM_STORAGE_CONTAINER_NAME - storage container name for blob-based tests
+// ** ARM_TEMP_RESOURCE_GROUP_NAME - temp resource group name for CLI-based tests
 // ** For example SIG gallery names must be unique not just within the resource group, but within a subscription, and a user may not have access to all SIGs in a subscription.
 // * As well as the following misc env variables
 // ** ARM_SSH_PRIVATE_KEY_FILE - the file location of a PEM encoded RSA SSH Private Key (ed25519 is not supported by Azure),
@@ -337,7 +339,8 @@ func testBuilderUserDataLinux(userdata string) string {
 	  "client_secret": "{{env `+"`ARM_CLIENT_SECRET`"+`}}",
 	  "subscription_id": "{{env `+"`ARM_SUBSCRIPTION_ID`"+`}}",
 	  "storage_account": "{{env `+"`ARM_STORAGE_ACCOUNT`"+`}}",
-	  "resource_group_name": "{{env `+"`ARM_RESOURCE_GROUP_NAME`"+`}}"
+	  "resource_group_name": "{{env `+"`ARM_RESOURCE_GROUP_NAME`"+`}}",
+	  "capture_container_name": "{{env `+"`ARM_STORAGE_CONTAINER_NAME`"+`}}"
 	},
 	"builders": [{
 	  "type": "azure-arm",
@@ -348,7 +351,7 @@ func testBuilderUserDataLinux(userdata string) string {
 
 	  "storage_account": "{{user `+"`storage_account`"+`}}",
 	  "resource_group_name": "{{user `+"`resource_group_name`"+`}}",
-	  "capture_container_name": "packeracc",
+	  "capture_container_name": "{{user `+"`capture_container_name`"+`}}",
 	  "capture_name_prefix": "testBuilderUserDataLinux",
 
 	  "os_type": "Linux",
@@ -517,7 +520,8 @@ const testBuilderAccBlobWindows = `
 	  "client_secret": "{{env ` + "`ARM_CLIENT_SECRET`" + `}}",
 	  "subscription_id": "{{env ` + "`ARM_SUBSCRIPTION_ID`" + `}}",
 	  "storage_account": "{{env ` + "`ARM_STORAGE_ACCOUNT`" + `}}",
-	  "resource_group_name": "{{env ` + "`ARM_RESOURCE_GROUP_NAME`" + `}}"
+	  "resource_group_name": "{{env ` + "`ARM_RESOURCE_GROUP_NAME`" + `}}",
+	  "capture_container_name": "{{env ` + "`ARM_STORAGE_CONTAINER_NAME`" + `}}"
 	},
 	"builders": [{
 	  "type": "azure-arm",
@@ -528,7 +532,7 @@ const testBuilderAccBlobWindows = `
 
 	  "storage_account": "{{user ` + "`storage_account`" + `}}",
 	  "resource_group_name": "{{user ` + "`resource_group_name`" + `}}",
-	  "capture_container_name": "packeracc",
+	  "capture_container_name": "{{user ` + "`capture_container_name`" + `}}",
 	  "capture_name_prefix": "testBuilderAccBlobWin",
 
 	  "os_type": "Windows",
@@ -555,7 +559,8 @@ const testBuilderAccBlobLinux = `
 	  "resource_group_name": "{{env ` + "`ARM_RESOURCE_GROUP_NAME`" + `}}",
 	  "client_secret": "{{env ` + "`ARM_CLIENT_SECRET`" + `}}",
 	  "subscription_id": "{{env ` + "`ARM_SUBSCRIPTION_ID`" + `}}",
-	  "storage_account": "{{env ` + "`ARM_STORAGE_ACCOUNT`" + `}}"
+	  "storage_account": "{{env ` + "`ARM_STORAGE_ACCOUNT`" + `}}",
+	  "capture_container_name": "{{env ` + "`ARM_STORAGE_CONTAINER_NAME`" + `}}"
 	},
 	"builders": [{
 	  "type": "azure-arm",
@@ -566,7 +571,7 @@ const testBuilderAccBlobLinux = `
 
 	  "storage_account": "{{user ` + "`storage_account`" + `}}",
 	  "resource_group_name": "{{user ` + "`resource_group_name`" + `}}",
-	  "capture_container_name": "packeracc",
+	  "capture_container_name": "{{user ` + "`capture_container_name`" + `}}",
 	  "capture_name_prefix": "testBuilderAccBlobLinux",
 
 	  "os_type": "Linux",
@@ -583,7 +588,8 @@ const testBuilderAccBlobLinux = `
 const testBuilderAccManagedDiskLinuxAzureCLI = `
 {
 	"variables": {
-	  "resource_group_name": "{{env ` + "`ARM_RESOURCE_GROUP_NAME`" + `}}"
+	  "resource_group_name": "{{env ` + "`ARM_RESOURCE_GROUP_NAME`" + `}}",
+	  "temp_resource_group_name": "{{env ` + "`ARM_TEMP_RESOURCE_GROUP_NAME`" + `}}"
 	},
 	"builders": [{
 	  "type": "azure-arm",
@@ -592,7 +598,7 @@ const testBuilderAccManagedDiskLinuxAzureCLI = `
 
 	  "managed_image_resource_group_name": "{{user ` + "`resource_group_name`" + `}}",
 	  "managed_image_name": "testBuilderAccManagedDiskLinuxAzureCLI-{{timestamp}}",
-	  "temp_resource_group_name": "packer-acceptance-test-managed-cli",
+	  "temp_resource_group_name": "{{user ` + "`temp_resource_group_name`" + `}}",
 
 	  "os_type": "Linux",
 	  "image_publisher": "Canonical",

builder/azure/arm/config.go

@@ -817,7 +817,7 @@ func (c *Config) formatCertificateForKeyVault(privateKey *rsa.PrivateKey) (strin
 		return "", err
 	}
 
-	pfxBytes, err := pkcs12.Encode(derBytes, privateKey, c.tmpCertificatePassword)
+	pfxBytes, err := pkcs12.EncodeModern(derBytes, privateKey, c.tmpCertificatePassword)
 	if err != nil {
 		err = fmt.Errorf("Failed to encode certificate as PFX: %s", err)
 		return "", err
@@ -1197,9 +1197,8 @@ func assertRequiredParametersSet(c *Config, errs *packersdk.MultiError) {
 	toInt := func(b bool) int {
 		if b {
 			return 1
-		} else {
-			return 0
 		}
+		return 0
 	}
 
 	isImageUrl := c.ImageUrl != ""
@@ -1576,15 +1575,16 @@ func assertRequiredParametersSet(c *Config, errs *packersdk.MultiError) {
 	if c.LicenseType != "" {
 		// Assumes OS is case-sensitive match as it has already been
 		// normalized earlier in function
-		if c.OSType == constants.Target_Linux {
+		switch c.OSType {
+		case constants.Target_Linux:
 			if strings.EqualFold(c.LicenseType, constants.License_RHEL) {
 				c.LicenseType = constants.License_RHEL
 			} else if strings.EqualFold(c.LicenseType, constants.License_SUSE) {
 				c.LicenseType = constants.License_SUSE
 			} else {
 				errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("The license_type %q is invalid for Linux, only RHEL_BYOS or SLES_BYOS are supported", c.LicenseType))
 			}
-		} else if c.OSType == constants.Target_Windows {
+		case constants.Target_Windows:
 			if strings.EqualFold(c.LicenseType, constants.License_Windows_Client) {
 				c.LicenseType = constants.License_Windows_Client
 			} else if strings.EqualFold(c.LicenseType, constants.License_Windows_Server) {
@@ -1724,7 +1724,7 @@ func isValidAzureName(re *regexp.Regexp, rgn string) bool {
 // 4) Contains a special character
 // 5) Control characters are not allowed (a very specific case - not included in this validation)
 func isValidPassword(password string) bool {
-	if !(len(password) >= 8 && len(password) <= 123) {
+	if len(password) < 8 || len(password) > 123 {
 		return false
 	}
 
@@ -1775,7 +1775,6 @@ func (c *Config) validateLocationZoneResiliency(say func(s string)) {
 	zones["switzerlandnorth"] = struct{}{}
 	zones["uksouth"] = struct{}{}
 	zones["usgovvirginia"] = struct{}{}
-	zones["westeurope"] = struct{}{}
 	zones["westus2"] = struct{}{}
 	zones["westus3"] = struct{}{}
 

builder/azure/arm/config_test.go

@@ -933,7 +933,7 @@ func TestConfigShouldAcceptTag(t *testing.T) {
 
 func TestConfigShouldRejectTagsInExcessOf50AcceptTags(t *testing.T) {
 	tooManyTags := map[string]string{}
-	for i := 0; i < 51; i++ {
+	for i := range 51 {
 		tooManyTags[fmt.Sprintf("tag%.2d", i)] = "ignored"
 	}
 
@@ -2096,7 +2096,7 @@ func TestPlanInfoPromotionCode(t *testing.T) {
 // exceeds the max tag amount, the builder should reject the configuration.
 func TestPlanInfoTooManyTagsErrors(t *testing.T) {
 	exactMaxNumberOfTags := map[string]string{}
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		exactMaxNumberOfTags[fmt.Sprintf("tag%.2d", i)] = "ignored"
 	}
 

builder/azure/arm/step_capture_image.go

@@ -192,7 +192,7 @@ func (s *StepCaptureImage) Run(ctx context.Context, state multistep.StateBag) mu
 				var dataDiskName = s.config.tmpDataDiskName
 				s.say(fmt.Sprintf(" -> dataDiskName              : '%s'", dataDiskName))
 
-				for i := 0; i < additionalDiskCount; i++ {
+				for i := range additionalDiskCount {
 					subDataDiskName := fmt.Sprintf("%s-%d", dataDiskName, i+1)
 
 					err = s.captureVHD(ctx, subscriptionId, resourceGroupName, subDataDiskName)

builder/azure/arm/step_deploy_template_test.go

@@ -229,11 +229,10 @@ func TestStepDeployTemplateCleanupShouldDeleteVirtualMachineAndNetworkResourcesI
 	}
 	if mockTrackers.actualNetworkResources == nil {
 		t.Fatalf("Expected DeployTemplate to call delete network resources but it didn't")
-	} else {
-		expectedResources := map[string]string{"Microsoft.Network/publicIPAddresses": "ip", "Microsoft.Network/virtualNetworks": "vnet"}
-		if diff := cmp.Diff(expectedResources, *mockTrackers.actualNetworkResources); diff != "" {
-			t.Fatalf("Unexpected difference in expected parameter deleteNetworkResources.resources %s", diff)
-		}
+	}
+	expectedResources := map[string]string{"Microsoft.Network/publicIPAddresses": "ip", "Microsoft.Network/virtualNetworks": "vnet"}
+	if diff := cmp.Diff(expectedResources, *mockTrackers.actualNetworkResources); diff != "" {
+		t.Fatalf("Unexpected difference in expected parameter deleteNetworkResources.resources %s", diff)
 	}
 }
 func TestStepDeployTemplateCleanupShouldDeleteKeyVault(t *testing.T) {