fix: Set disk zone to null when creating ZRS disk#237
Merged
Conversation
ZRS disks can't be created with an availablity zone. When a VM is created with the zone variable set to anything other than `null`, this value is also used for creating disk leading to errors.
microsoft-github-policy-service
Bot
added
the
Needs: Triage 🔍
jtracey93
requested changes
Apr 29, 2026
jtracey93
left a comment
jtracey93
left a comment
There was a problem hiding this comment.
Thanks @Rickmarges for the PR. Could you please add a new example or update one of the existing ones to test out the functionality you've added here around ZRS?
This way we know its working and also doesnt regress in future updates
Thanks
Contributor
|
Moving into a merge branch so we can run the tests. |
jchancellor-ms
added a commit
that referenced
this pull request
Jun 6, 2026
* gallery app and azapi fixes * azapi and gallery app fixes * interface spec updates * lock and doc fixes * test region updates * version updates * role_assignments aad_check default to false * example and dependency updates * sku_selector azapi version fix * fix(vm): relax random provider constraint for cross-module compatibility (#245) * fix(vm): relax random provider constraint for cross-module compatibility * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Bas Veenendaal <bas@novygate.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix: accept gzipped base64 payloads in custom_data validation (#238) * fix: accept gzipped base64 payloads in custom_data validation (#207) * test: add example for gzipped and plaintext custom_data (#207) --------- Co-authored-by: Martin Oehlert <453360+MO2k4@users.noreply.github.com> * fix: Set disk zone to null when creating ZRS disk (#237) * Set disk zone to null when creating ZRS disk ZRS disks can't be created with an availablity zone. When a VM is created with the zone variable set to anything other than `null`, this value is also used for creating disk leading to errors. * Add zonal vm with ZRS disk example * feat: add os_managed_disk_id support for attaching existing managed disk as OS disk (#234) * feat: add os_managed_disk_id support for attaching existing managed disk as OS disk Add support for the os_managed_disk_id parameter on both azurerm_linux_virtual_machine and azurerm_windows_virtual_machine resources, allowing users to create VMs from existing managed disks (Attach mode). Changes: - variables.tf: Add os_managed_disk_id variable with format validation and mutual exclusivity check against source_image_resource_id - locals.tf: Add os_disk_is_imported local for readability - locals.auth.tf: Skip credential generation when os_managed_disk_id is set (admin_username=null, no random password/SSH key generation) - main.linux_vm.tf: Add os_managed_disk_id, conditionally null out ConflictsWith fields (admin_password, computer_name, custom_data, provision_vm_agent, patch_mode, patch_assessment_mode, bypass_platform_safety_checks, reboot_setting), update source_image_reference and admin_ssh_key conditions - main.windows_vm.tf: Same as Linux plus Windows-specific ConflictsWith fields (enable_automatic_updates, hotpatching_enabled) Provider behavior reference (azurerm_linux/windows_virtual_machine): - os_managed_disk_id ExactlyOneOf: admin_username, source_image_id, source_image_reference - ConflictsWith (shared): admin_password, computer_name, custom_data, provision_vm_agent, patch_mode, patch_assessment_mode, bypass_platform_safety_checks_on_user_schedule_enabled, reboot_setting - ConflictsWith (Windows): hotpatching_enabled, enable_automatic_updates - When set, Provider uses CreateOption=Attach and skips OsProfile Closes #230 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore: run pre-commit to sync docs and mapotf ordering * fix: harden os_managed_disk_id attach mode and add example - Fix admin_password_linux/windows locals to return null when os_disk_is_imported, preventing random_password[0] resolution errors - Fix password_secret_count and ssh_secret_count to return 0 when os_disk_is_imported, skipping unnecessary Key Vault secret creation - Add lifecycle precondition to prevent os_managed_disk_id and os_disk.diff_disk_settings from being set simultaneously - Add examples/linux_os_managed_disk/ for e2e test coverage of the attach-from-managed-disk path - Update source_image_reference variable description to mention os_managed_disk_id mutual exclusivity - Run pre-commit to sync docs and formatting Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: add os_disk_attach_mode variable for plan-time determinism When os_managed_disk_id is set from a computed resource attribute (e.g., azurerm_managed_disk.example.id), Terraform cannot determine the null check at plan time, causing 'count depends on resource attributes that cannot be determined' errors. Add os_disk_attach_mode (bool, default false) that users must set to true alongside os_managed_disk_id. This ensures count expressions are deterministic during planning. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: guard SSH key and credential name locals for attach mode - Add os_disk_is_imported check to admin_ssh_key local to skip SSH key generation when tls_private_key.this is empty in attach mode - Add os_disk_is_imported check to admin_ssh_key_secret_value local - Use coalesce(admin_username, 'imported') in credential secret names to prevent null string interpolation errors when admin_username is null in attach mode Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: null out os_disk.storage_account_type in attach mode The AzureRM Provider enforces ConflictsWith between os_disk.storage_account_type and os_managed_disk_id. When attaching an existing managed disk, storage_account_type must be null since the disk type is already determined by the existing disk. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * pre-commit clean-up * deprecated hallucination * var dup cleanup * example lint fixes * exception example update * avssec for linux example --------- Co-authored-by: Bas Veenendaal <bas@basveenendaal.com> Co-authored-by: Bas Veenendaal <bas@novygate.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Martin Oehlert <mo1987@gmx.net> Co-authored-by: Martin Oehlert <453360+MO2k4@users.noreply.github.com> Co-authored-by: Rickmarges <rickmarges@gmail.com> Co-authored-by: lonegunmanb <lonegunmanb@hotmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
ZRS disks can't be created with an availablity zone. When a VM is created with the zone variable set to anything other than
null, this value is also used for creating disk leading to errors.This change will check for the presence of
ZRSin the type string. If present, it will always set zone tonull.Fixes #236
Type of Change
Checklist