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

google_dns_managed_zone labels patching #6062

Merged

Conversation

ichbinfrog
Copy link
Contributor

Fixes this issue wherein PATCH is used instead of PUT for google_dns_managed_zone, leading to the inability to remove labels from the resource (and thus a perma-diff).

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.
dns: fixed perma-diff for updated labels in `google_dns_managed_zone`

@modular-magician
Copy link
Collaborator

Hello! I am a robot who works on Magic Modules PRs.

I've detected that you're a community contributor. @rileykarson, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

  • Ensuring it's backwards compatible, covers common error cases, etc.
  • Summarizing the change into a user-facing changelog note.
  • Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.


@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 89 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 3 files changed, 101 insertions(+), 9 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2022
Passed tests 1790
Skipped tests: 226
Failed tests: 6

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccDNSManagedZone_update|TestAccDNSManagedZone_privateForwardingUpdate|TestAccDNSManagedZone_dnssec_update|TestAccDNSManagedZone_privateUpdate|TestAccDataSourceDnsManagedZone_basic

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccDNSManagedZone_privateForwardingUpdate[view]
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccDNSManagedZone_privateUpdate[view]
TestAccDNSManagedZone_dnssec_update[view]
TestAccDNSManagedZone_update[view]

Tests failed during RECORDING mode:
TestAccDataSourceDnsManagedZone_basic[view]

Please fix these to complete your PR
View the build log or the debug log for each test

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 4 files changed, 90 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 4 files changed, 102 insertions(+), 9 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2028
Passed tests 1800
Skipped tests: 226
Failed tests: 2

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccFirebaserulesRelease_BasicRelease|TestAccDataSourceDnsManagedZone_basic

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccDataSourceDnsManagedZone_basic[view]

Please fix these to complete your PR
View the build log or the debug log for each test

Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

Ah, JSON Merge patch must be biting us here. Most of GCP uses a PUT-like patch, thanks!

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 4 files changed, 90 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 4 files changed, 102 insertions(+), 9 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2034
Passed tests 1804
Skipped tests: 226
Failed tests: 4

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccContainerCluster_withConfidentialNodes|TestAccContainerCluster_withAddons|TestAccFirebaserulesRelease_BasicRelease|TestAccDataSourceDnsManagedZone_basic

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccDataSourceDnsManagedZone_basic[view]
TestAccContainerCluster_withConfidentialNodes[view]
TestAccContainerCluster_withAddons[view]

Please fix these to complete your PR
View the build log or the debug log for each test

Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

Can you add managed_zone_id and creation_time to the ignored list in https://github.com/hashicorp/terraform-provider-google/blob/0ee225124de410a7fc8d69e236d9ff104006f664/google/data_source_dns_managed_zone_test.go#L23-L29, or support them in the datasource as well? Either's fine- the way the test is written couples the datasource and resource tightly even though their implementation is not as coupled.

@rileykarson rileykarson requested a review from melinath June 6, 2022 20:02
@rileykarson
Copy link
Member

I'll be out for a bit- @melinath, rolled you as a replacement reviewer for this PR!

@melinath
Copy link
Member

melinath commented Jun 7, 2022

/gcbrun

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 4 files changed, 95 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 4 files changed, 107 insertions(+), 9 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2038
Passed tests 1809
Skipped tests: 226
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccFirebaserulesRelease_BasicRelease|TestAccContainerCluster_withConfidentialNodes|TestAccContainerCluster_withAddons

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccContainerCluster_withAddons[view]
TestAccContainerCluster_withConfidentialNodes[view]

Please fix these to complete your PR
View the build log or the debug log for each test

Copy link
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

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

LGTM - seems straightforward, and the comments were addressed. Remaining test failures are unrelated.

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

Successfully merging this pull request may close these issues.

4 participants