Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_site_recovery_replicated_vm - support 'target_availability_zone' argument #15617

Merged
merged 14 commits into from
Mar 23, 2022
Merged

azurerm_site_recovery_replicated_vm - support 'target_availability_zone' argument #15617

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d1f5f46
Added 'target_availability_zone' argument for zone-zone disaster reco…
cheng514 Feb 27, 2022
205ec29
updated id to zone
cheng514 Feb 28, 2022
b40d571
removed suppress case difference for zone number
cheng514 Feb 28, 2022
374b8b0
updated to common schema for target zone
cheng514 Feb 28, 2022
e3310ca
updated argument description
cheng514 Feb 28, 2022
bd00c7e
fixed site recovery commonschema for target zone and added acc testing
cheng514 Feb 28, 2022
d375aeb
fixed errors in zone to zone test'
cheng514 Feb 28, 2022
2c0e460
revert back change by mistake
cheng514 Feb 28, 2022
1af74d5
Fix linting
myc2h6o Mar 8, 2022
7d08532
Merge pull request #1 from myc2h6o/availability_zone_ci
cheng514 Mar 8, 2022
d36b187
Merge branch 'hashicorp:main' into main
cheng514 Mar 21, 2022
102a9e6
Added conflict with for target_zone.
cheng514 Mar 21, 2022
c93db7c
removed commonschema import
cheng514 Mar 21, 2022
9646a3b
Update site_recovery_replicated_vm_resource.go
katbyte Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions internal/services/recoveryservices/site_recovery_replicated_vm_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,24 @@ func resourceSiteRecoveryReplicatedVM() *pluginsdk.Resource {
Optional: true,
ValidateFunc: azure.ValidateResourceID,
DiffSuppressFunc: suppress.CaseDifference,
ConflictsWith: []string{
"target_availability_zone",
},
},
"target_availability_zone": {
cheng514 marked this conversation as resolved.
Show resolved Hide resolved
Type: pluginsdk.TypeString,
Optional: true,
// Default: "None",
Computed: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
"1",
"2",
"3",
}, false),
ConflictsWith: []string{
"target_availability_set_id",
},
cheng514 marked this conversation as resolved.
Show resolved Hide resolved
},
"target_network_id": {
Type: pluginsdk.TypeString,
Expand Down Expand Up @@ -239,6 +257,13 @@ func resourceSiteRecoveryReplicatedItemCreate(d *pluginsdk.ResourceData, meta in
targetAvailabilitySetID = nil
}

var targetAvailabilityZone *string
if zone, isSet := d.GetOk("target_availability_zone"); isSet {
targetAvailabilityZone = utils.String(zone.(string))
} else {
targetAvailabilityZone = nil
}

ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down Expand Up @@ -284,6 +309,7 @@ func resourceSiteRecoveryReplicatedItemCreate(d *pluginsdk.ResourceData, meta in
RecoveryContainerID: &targetProtectionContainerId,
RecoveryResourceGroupID: &targetResourceGroupId,
RecoveryAvailabilitySetID: targetAvailabilitySetID,
RecoveryAvailabilityZone: targetAvailabilityZone,
VMManagedDisks: &managedDisks,
},
},
Expand Down Expand Up @@ -451,6 +477,7 @@ func resourceSiteRecoveryReplicatedItemRead(d *pluginsdk.ResourceData, meta inte
d.Set("source_vm_id", a2aDetails.FabricObjectID)
d.Set("target_resource_group_id", a2aDetails.RecoveryAzureResourceGroupID)
d.Set("target_availability_set_id", a2aDetails.RecoveryAvailabilitySet)
d.Set("target_availability_zone", a2aDetails.RecoveryAvailabilityZone)
d.Set("target_network_id", a2aDetails.SelectedRecoveryAzureNetworkID)
if a2aDetails.ProtectedManagedDisks != nil {
disksOutput := make([]interface{}, 0)
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/site_recovery_replicated_vm.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ The following arguments are supported:

* `target_availability_set_id` - (Optional) Id of availability set that the new VM should belong to when a failover is done.

* `target_availability_zone` - (Optional) Availability zone number that the new VM should belong to when a failover is done.
cheng514 marked this conversation as resolved.
Show resolved Hide resolved

* `managed_disk` - (Required) One or more `managed_disk` block.

* `target_network_id` - (Optional) Network to use when a failover is done (recommended to set if any network_interface is configured for failover).
Expand Down