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.

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_sentinel_alert_rule_scheduled - remove forcenew for alert_rule_template_version #25688

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

ziyeqf
Copy link
Contributor

@ziyeqf ziyeqf commented Apr 22, 2024

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

remove the forcenew property for alert_rule_template_version. As per testing it's not required now.

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)
❯❯ tftest sentinel TestAccSentinelAlertRuleScheduled        
=== RUN   TestAccSentinelAlertRuleScheduled_basic
=== PAUSE TestAccSentinelAlertRuleScheduled_basic
=== RUN   TestAccSentinelAlertRuleScheduled_upgrade
=== PAUSE TestAccSentinelAlertRuleScheduled_upgrade
=== RUN   TestAccSentinelAlertRuleScheduled_complete
=== PAUSE TestAccSentinelAlertRuleScheduled_complete
=== RUN   TestAccSentinelAlertRuleScheduled_update
=== PAUSE TestAccSentinelAlertRuleScheduled_update
=== RUN   TestAccSentinelAlertRuleScheduled_requiresImport
=== PAUSE TestAccSentinelAlertRuleScheduled_requiresImport
=== RUN   TestAccSentinelAlertRuleScheduled_withAlertRuleTemplateGuid
=== PAUSE TestAccSentinelAlertRuleScheduled_withAlertRuleTemplateGuid
=== RUN   TestAccSentinelAlertRuleScheduled_updateEventGroupingSetting
=== PAUSE TestAccSentinelAlertRuleScheduled_updateEventGroupingSetting
=== CONT  TestAccSentinelAlertRuleScheduled_basic
=== CONT  TestAccSentinelAlertRuleScheduled_requiresImport
=== CONT  TestAccSentinelAlertRuleScheduled_updateEventGroupingSetting
=== CONT  TestAccSentinelAlertRuleScheduled_complete
=== CONT  TestAccSentinelAlertRuleScheduled_upgrade
=== CONT  TestAccSentinelAlertRuleScheduled_withAlertRuleTemplateGuid
=== CONT  TestAccSentinelAlertRuleScheduled_update
=== NAME  TestAccSentinelAlertRuleScheduled_requiresImport
    testing_new.go:90: Error running post-test destroy, there may be dangling resources: exit status 1
        
        Error: deleting Solution (Subscription: "*****"
        Resource Group Name: "acctestRG-sentinel-240422142804380013"
        Solution Name: "SecurityInsights(acctestLAW-240422142804380013)"): performing Delete: unexpected status 204 (204 No Content) received with no body
        
        deleting Solution (Subscription: "*****"
        Resource Group Name: "acctestRG-sentinel-240422142804380013"
        Solution Name: "SecurityInsights(acctestLAW-240422142804380013)"): performing
        Delete: unexpected status 204 (204 No Content) received with no body
--- FAIL: TestAccSentinelAlertRuleScheduled_requiresImport (143.33s)
--- PASS: TestAccSentinelAlertRuleScheduled_complete (287.05s)
--- PASS: TestAccSentinelAlertRuleScheduled_basic (289.01s)
--- PASS: TestAccSentinelAlertRuleScheduled_withAlertRuleTemplateGuid (289.63s)
--- PASS: TestAccSentinelAlertRuleScheduled_updateEventGroupingSetting (362.60s)
--- PASS: TestAccSentinelAlertRuleScheduled_upgrade (370.77s)
--- PASS: TestAccSentinelAlertRuleScheduled_update (429.31s)
FAIL
FAIL	github.com/hashicorp/terraform-provider-azurerm/internal/services/sentinel	429.385s
FAIL

rerun the failed one

❯❯ tftest sentinel TestAccSentinelAlertRuleScheduled_requiresImport
=== RUN   TestAccSentinelAlertRuleScheduled_requiresImport
=== PAUSE TestAccSentinelAlertRuleScheduled_requiresImport
=== CONT  TestAccSentinelAlertRuleScheduled_requiresImport
--- PASS: TestAccSentinelAlertRuleScheduled_requiresImport (206.98s)
PASS
ok  	github.com/hashicorp/terraform-provider-azurerm/internal/services/sentinel	207.060s

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

azurerm_sentinel_alert_rule_scheduled - remove forcenew for alert_rule_template_version [GH-25688]

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #25564

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

Copy link
Member

@jackofallops jackofallops left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ziyeqf - Thanks for this PR. It looks mostly fine, but one comment below to take a look at if you could?

Thanks

Comment on lines 364 to 369
func (r SentinelAlertRuleScheduledResource) upgradeVersion(data acceptance.TestData, update bool) string {
version := "1.0.4"
if update {
version = "1.0.5"
}
return fmt.Sprintf(`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason not to just use a string here and avoid complication of the bool to string evaluation, and be able to provide values in the calling test? e.g.

Suggested change
func (r SentinelAlertRuleScheduledResource) upgradeVersion(data acceptance.TestData, update bool) string {
version := "1.0.4"
if update {
version = "1.0.5"
}
return fmt.Sprintf(`
func (r SentinelAlertRuleScheduledResource) upgradeVersion(data acceptance.TestData, version string) string {
return fmt.Sprintf(`

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error "409 Conflict" when updating a Sentinel analytics rule
2 participants