Skip to content

azurerm_monitor_diagnostic_setting - fix issue when updating enabled_log to empty#28485

Merged
catriona-m merged 2 commits intohashicorp:mainfrom
teowa:fix_diag_enabled_log
Mar 18, 2025
Merged

azurerm_monitor_diagnostic_setting - fix issue when updating enabled_log to empty#28485
catriona-m merged 2 commits intohashicorp:mainfrom
teowa:fix_diag_enabled_log

Conversation

@teowa
Copy link
Collaborator

@teowa teowa commented Jan 13, 2025 •
edited
Loading

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 comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

Fix the issue that when updating enabled_log to empty, if we send "logs":null, the server will not update the logs. To fix this, we need to explicitly disable each log in request.

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)

image

Change Log

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

  • azurerm_monitor_diagnostic_setting - fix update enabled_log to empty

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 #28428

Note

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

@teowa teowa requested a review from a team as a code owner January 13, 2025 08:37
@teowa teowa changed the title azurerm_monitor_diagnostic_setting - fix update enabled_log to empty azurerm_monitor_diagnostic_setting - fix update enabled_log to empty Jan 13, 2025
@teowa teowa changed the title azurerm_monitor_diagnostic_setting - fix update enabled_log to empty azurerm_monitor_diagnostic_setting - fix issue when updating enabled_log to empty Jan 13, 2025
catriona-m
catriona-m requested changes Mar 14, 2025
View reviewed changes
Copy link
Member

@catriona-m catriona-m left a comment

Choose a reason for hiding this comment

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

Thanks @teowa - I just left one comment on the tests but once that is addressed I can take another look. Thanks!

internal/services/monitor/monitor_diagnostic_setting_resource_test.go Outdated
Comment on lines +268 to +275
{
Config: r.eventhub(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("enabled_log.#").HasValue("0"),
),
},
data.ImportStep(),
Copy link
Member

@catriona-m catriona-m Mar 14, 2025

Choose a reason for hiding this comment

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

we can remove this here since we are already testing this in TestAccMonitorDiagnosticSetting_enabledLogsMix

Copy link
Collaborator Author

@teowa teowa Mar 17, 2025

Choose a reason for hiding this comment

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

removed

catriona-m
catriona-m approved these changes Mar 18, 2025
View reviewed changes
Copy link
Member

@catriona-m catriona-m left a comment

Choose a reason for hiding this comment

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

Thanks @teowa LGTM!

@catriona-m catriona-m merged commit 61da5c1 into hashicorp:main Mar 18, 2025
31 checks passed
@github-actions github-actions bot added this to the v4.24.0 milestone Mar 18, 2025
catriona-m added a commit that referenced this pull request Mar 18, 2025
@catriona-m
Update CHANGELOG.md #28485
b3725d5
jackofallops added a commit that referenced this pull request Mar 21, 2025
@catriona-m @sreallymatt
@wyattfry @jackofallops @mbfrahry @stephybun
CHANGELOG.md for v4.24.0 (#29077)
e81ab19 
* CHANGELOG.md for v4.24.0

* Update CHANGELOG.md #28173

* Update CHANGELOG.md #28964

* Update CHANGELOG.md #28569

* Update CHANGELOG.md for #28670

* Update CHANGELOG.md #29081

* Update CHANGELOG.md for #29082

* Update CHANGELOG.md #28888

* Update CHANGELOG.md #29012

* Update CHANGELOG.md #28485

* Update CHANGELOG.md for #29094

* Update CHANGELOG.md #29107

* Update CHANGELOG.md #28368

* Update for #29113 #28884 #28739 #28920 #29018 #28822 #28977 #29096 #29040

* Update for #29088

* Update CHANGELOG.md #29079

* Update CHANGELOG.md #28992

* prep for release

---------

Co-authored-by: sreallymatt <106555974+sreallymatt@users.noreply.github.com>
Co-authored-by: Wyatt Fry <wyattfry@gmail.com>
Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com>
Co-authored-by: Matthew Frahry <mbfrahry@gmail.com>
Co-authored-by: stephybun <steph@hashicorp.com>
Co-authored-by: jackofallops <ste@hashicorp.com>
@github-actions
Copy link
Contributor

github-actions bot commented Apr 18, 2025

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.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 18, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@catriona-m catriona-m catriona-m approved these changes

Assignees

@catriona-m catriona-m

Labels

bug service/monitor size/XS

Projects

None yet

Milestone

v4.24.0

Development

Successfully merging this pull request may close these issues.

Diagnostic settings logs categories enabled back after some time if logs categories list is empty

2 participants

@teowa @catriona-m