-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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_replication_recovery_plan
: fix update for boot_recovery_group
,failover_recovery_group
and shutdown_recovery_group
#22687
Merged
catriona-m
merged 4 commits into
hashicorp:main
from
ziyeqf:tengzh/issue/recoveryplan_update
Jul 28, 2023
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -517,14 +517,47 @@ func (r SiteRecoveryReplicationRecoveryPlanResource) Update() sdk.ResourceFunc { | |
return fmt.Errorf("parse Site reocvery replication plan id: %+v", err) | ||
} | ||
|
||
recoveryPlanGroup, err := expandRecoveryGroup(model.RecoveryGroup) | ||
if err != nil { | ||
return fmt.Errorf("when expanding recovery group: %s", err) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this can be removed here now too since we aren't expanding the group here anymore There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. updated, sorry for that.. |
||
|
||
resp, err := client.Get(ctx, *id) | ||
if err != nil { | ||
return fmt.Errorf("retrieving %s: %+v", *id, err) | ||
} | ||
|
||
var groupValue []replicationrecoveryplans.RecoveryPlanGroup | ||
if resp.Model == nil { | ||
return fmt.Errorf("retrieving %s: model is nil", *id) | ||
} | ||
|
||
if resp.Model.Properties == nil { | ||
return fmt.Errorf("retrieving %s: properties is nil", *id) | ||
} | ||
|
||
if resp.Model.Properties.Groups == nil { | ||
return fmt.Errorf("retrieving %s: groups is nil", *id) | ||
} | ||
|
||
groupValue = *resp.Model.Properties.Groups | ||
|
||
if metadata.ResourceData.HasChange("recovery_group") { | ||
groupValue, err = expandRecoveryGroup(model.RecoveryGroup) | ||
} | ||
|
||
if metadata.ResourceData.HasChange("boot_recovery_group") || | ||
metadata.ResourceData.HasChange("failover_recovery_group") || | ||
metadata.ResourceData.HasChange("shutdown_recovery_group") { | ||
groupValue, err = expandRecoveryGroupNew(model.ShutdownRecoveryGroup, model.FailoverRecoveryGroup, model.BootRecoveryGroup) | ||
} | ||
|
||
if err != nil { | ||
return fmt.Errorf("expanding recovery group: %+v", err) | ||
} | ||
|
||
parameters := replicationrecoveryplans.UpdateRecoveryPlanInput{ | ||
Properties: &replicationrecoveryplans.UpdateRecoveryPlanInputProperties{ | ||
Groups: &recoveryPlanGroup, | ||
Groups: &groupValue, | ||
}, | ||
} | ||
|
||
|
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move this below the new code and remove the duplicate extra error return code in the if-else structure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code updated, thanks