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_container_group - Fix update error with diagnostics.log_analytics defined #28025

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

magodo
Copy link
Collaborator

@magodo magodo commented Nov 15, 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 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

This PR fixes an issue where updating the identity.type argument for the azurerm_container_group resource throws an error when diagnostics.log_analytics is defined due to the workspace key is not in the PUT request body (see: #27999).

Meanwhile, to pass the test cases, I did the following updates to the tests:

  • Changing the TestAccContainerGroup_linuxBasicUpdate to be TestAccContainerGroup_linuxBasicMultipleContainers, as the previous one introduces a recreate (as the container block is force new).
  • Changing the image value, as the previous ones are non-existed anymore. E.g. the TC has a lot of failures regarding this:
    testcase.go:173: Step 1/3 error: Error running apply: exit status 1
        Error: creating Container Group (Subscription: "*******"
        Resource Group Name: "acctestRG-241113234136602111"
        Container Group Name: "acctestcontainergroup-241113234136602111"): performing ContainerGroupsCreateOrUpdate: unexpected status 400 (400 Bad Request) with error: InaccessibleImage: The image 'mcr.microsoft.com/quantum/linux-selfcontained:latest' in container group 'acctestcontainergroup-241113234136602111' is not accessible. Please check the image and registry credential.
          with azurerm_container_group.test,
          on terraform_plugin_test.tf line 33, in resource "azurerm_container_group" "test":
          33: resource "azurerm_container_group" "test" {

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)
$ TF_ACC=1 go test -v -timeout=20h -run='TestAccContainerGroup_(linuxBasic|AssignedIdentityUpdate)' ./internal/services/containers
=== RUN   TestAccContainerGroup_AssignedIdentityUpdate
=== PAUSE TestAccContainerGroup_AssignedIdentityUpdate
=== RUN   TestAccContainerGroup_AssignedIdentityUpdateWithLogWorkspace
=== PAUSE TestAccContainerGroup_AssignedIdentityUpdateWithLogWorkspace
=== RUN   TestAccContainerGroup_linuxBasic
=== PAUSE TestAccContainerGroup_linuxBasic
=== RUN   TestAccContainerGroup_linuxBasicMultipleContainers
=== PAUSE TestAccContainerGroup_linuxBasicMultipleContainers
=== RUN   TestAccContainerGroup_linuxBasicTagsUpdate
=== PAUSE TestAccContainerGroup_linuxBasicTagsUpdate
=== CONT  TestAccContainerGroup_AssignedIdentityUpdate
=== CONT  TestAccContainerGroup_linuxBasicTagsUpdate
=== CONT  TestAccContainerGroup_linuxBasicMultipleContainers
=== CONT  TestAccContainerGroup_linuxBasic
=== CONT  TestAccContainerGroup_AssignedIdentityUpdateWithLogWorkspace
--- PASS: TestAccContainerGroup_linuxBasic (99.34s)
--- PASS: TestAccContainerGroup_linuxBasicTagsUpdate (103.30s)
--- PASS: TestAccContainerGroup_linuxBasicMultipleContainers (150.62s)
--- PASS: TestAccContainerGroup_AssignedIdentityUpdate (154.40s)
--- PASS: TestAccContainerGroup_AssignedIdentityUpdateWithLogWorkspace (185.62s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/containers    185.652s

Change Log

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

  • azurerm_container_group - Fix update error with diagnostics.log_analytics defined [GH-00000]

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

Note

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

@magodo magodo requested review from katbyte and a team as code owners November 15, 2024 01:13
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @magodo LGTM 👍

@stephybun stephybun merged commit f7de460 into hashicorp:main Dec 3, 2024
39 checks passed
@github-actions github-actions bot added this to the v4.13.0 milestone Dec 3, 2024
stephybun added a commit that referenced this pull request Dec 3, 2024
katbyte added a commit that referenced this pull request Dec 6, 2024
* update for #28158, #28025

* Update CHANGELOG.md #28123

* Update CHANGELOG.md #28105

* Update for #28177

* Update for #28171

* Update for #28178

* Update CHANGELOG.md

---------

Co-authored-by: catriona-m <86247157+catriona-m@users.noreply.github.com>
Co-authored-by: kt <kt@katbyte.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants