azurerm_security_center_pricing - force new resource to be created when subplan changes#27805
Merged
stephybun merged 25 commits intohashicorp:mainfrom Feb 26, 2025
Merged
Conversation
This comment was marked as off-topic.
This comment was marked as off-topic.
Collaborator
Author
|
kindly bubble this up |
Collaborator
Author
|
convert to draft to update |
|
@ziyeqf ping. There is a customer waiting for this since October. Microsoft is not looking very good here. |
stephybun
suggested changes
Feb 13, 2025
| func resourceSecurityCenterSubscriptionPricing() *pluginsdk.Resource { | ||
| return &pluginsdk.Resource{ | ||
| Create: resourceSecurityCenterSubscriptionPricingUpdate, | ||
| res := &pluginsdk.Resource{ |
Member
There was a problem hiding this comment.
We can remove this variable declaration since we're not patching anything in the resource here
| func resourceSecurityCenterSubscriptionPricingUpdate(d *pluginsdk.ResourceData, meta interface{}) error { | ||
| func resourceSecurityCenterSubscriptionPricingCreate(d *pluginsdk.ResourceData, meta interface{}) error { | ||
| client := meta.(*clients.Client).SecurityCenter.PricingClient | ||
|
|
|
|
||
| subscriptionId := meta.(*clients.Client).Account.SubscriptionId | ||
| ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) | ||
|
|
|
|
||
| func resourceSecurityCenterSubscriptionPricingUpdate(d *pluginsdk.ResourceData, meta interface{}) error { | ||
| client := meta.(*clients.Client).SecurityCenter.PricingClient | ||
|
|
|
|
||
| updateResponse, updateErr := client.Update(ctx, *id, update) | ||
| if updateErr != nil { | ||
| return fmt.Errorf("setting %s: %+v", id, updateErr) |
Member
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("setting %s: %+v", id, updateErr) | |
| return fmt.Errorf("updating %s: %+v", id, updateErr) |
| return fmt.Errorf("setting %s: %+v", id, updateErr) | ||
| } | ||
|
|
||
| // The extensions list from backend might vary after `tier` changed, thus we need to retire it again. |
Member
There was a problem hiding this comment.
should this be?
Suggested change
| // The extensions list from backend might vary after `tier` changed, thus we need to retire it again. | |
| // The extensions list from backend might vary after `tier` changed, thus we need to retrieve it again. |
| update.Properties.Extensions = extensions | ||
| _, updateErr := client.Update(ctx, *id, update) | ||
| if updateErr != nil { | ||
| return fmt.Errorf("setting %s: %+v", id, updateErr) |
Member
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("setting %s: %+v", id, updateErr) | |
| return fmt.Errorf("updating %s: %+v", id, updateErr) |
| requiredAdditionalUpdate = currentlyFreeTier | ||
| } | ||
|
|
||
| updateResponse, updateErr := client.Update(ctx, *id, update) |
Member
There was a problem hiding this comment.
we should be able to reuse err here
Suggested change
| updateResponse, updateErr := client.Update(ctx, *id, update) | |
| updateResponse, err := client.Update(ctx, *id, update) |
| return fmt.Errorf("setting %s: %+v", id, updateErr) | ||
| } | ||
| update.Properties.Extensions = extensions | ||
| _, updateErr := client.Update(ctx, *id, update) |
Member
There was a problem hiding this comment.
Suggested change
| _, updateErr := client.Update(ctx, *id, update) | |
| _, err = client.Update(ctx, *id, update) |
Comment on lines
+170
to
+173
| ### `azurerm_security_center_princing_tier` | ||
|
|
||
| * Changing the property `subplan` now forces a new resource to be created. | ||
|
|
Member
There was a problem hiding this comment.
This isn't a 5.0 change anymore so this should be removed
Collaborator
Author
|
kindly bubble this up |
Collaborator
Author
|
kindly ping @stephybun |
stephybun
approved these changes
Feb 26, 2025
stephybun
added a commit
that referenced
this pull request
Feb 26, 2025
jackofallops
added a commit
that referenced
this pull request
Feb 27, 2025
* Update CHANGELOG.md for #28840 * Update CHANGELOG.md #28808 * Update CHANGELOG.md #27962 * Update CHANGELOG.md for #28859 * Update for #28825 * Update CHANGELOG.md for #28864 * Update CHANGELOG.md #28539 * Update CHANGELOG.md #28685 * Update CHANGELOG.md for #28818 * Update for #28857 #28799 #28856 * Update for #28122 * Update for #28248 #27805 * Update for #28853 * Update for #28316 #28494 #28696 * Update for #28754 * Update CHANGELOG.md #28771 * Update CHANGELOG.md #28842 * Update for #28879 * Update for #28199 * Update CHANGELOG.md #28862 * prep for release v4.21.0 --------- Co-authored-by: sreallymatt <106555974+sreallymatt@users.noreply.github.com> Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com> Co-authored-by: stephybun <steph@hashicorp.com> Co-authored-by: catriona-m <86247157+catriona-m@users.noreply.github.com> Co-authored-by: Matthew Frahry <mbfrahry@gmail.com> Co-authored-by: Wyatt Fry <wyattfry@gmail.com>
Contributor
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Community Note
Description
When
subplanchanges, there might be extensions enabled by default, force a new resource to be created to keep the resource consistent with configuration.PR Checklist
For example: “
resource_name_here- description of change e.g. adding propertynew_property_name_here”Changes to existing Resource / Data Source
Testing
azurerm_security_center_pricing- force new resource to be created when subplan changes [azurerm_security_center_pricing- force new resource to be created whensubplanchanges #27805]This is a (please select all that apply):
Related Issue(s)
Fixes #27338
Note
If this PR changes meaningfully during the course of review please update the title and description as required.