Normalize name field by trodge · Pull Request #8360 · GoogleCloudPlatform/magic-modules

trodge · 2023-07-14T18:23:43Z

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).
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).
Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
Read Write release notes before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

monitoring: fixed an issue which occurred when `name` field of `google_monitoring_monitored_project` was long-form

zli82016 · 2023-07-14T18:29:28Z

Which test has the problem, @trodge ? Is this one TestAccMonitoringMonitoredProject_monitoringMonitoredProjectBasicExample?

modular-magician · 2023-07-14T18:38:56Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 2 files changed, 9 insertions(+), 4 deletions(-))
Terraform Beta: Diff ( 1 file changed, 8 insertions(+), 4 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-07-14T20:24:33Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 4 files changed, 61 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 3 files changed, 61 insertions(+), 7 deletions(-))
TF Conversion: Diff ( 3 files changed, 4 insertions(+), 3 deletions(-))

zli82016 · 2023-07-14T21:11:37Z

Add a secondary reviewer @slevenick

slevenick · 2023-07-14T21:35:06Z

 immutable: true
 error_retry_predicates: ['transport_tpg.IsMonitoringPermissionError']
 custom_code: !ruby/object:Provider::Terraform::CustomCode
+  custom_import: templates/terraform/custom_import/monitoring_monitored_project.go.erb


Why do we need a custom import here? Is it only to support importing with the v1/ prefix?

It's there to shorten the name and metrics_scope fields in the import id.

slevenick · 2023-07-14T21:35:38Z

 delete_url: v1/locations/global/metricsScopes/{{metrics_scope}}/projects/{{name}}
 self_link: v1/locations/global/metricsScopes/{{metrics_scope}}
-id_format: v1/locations/global/metricsScopes/{{metrics_scope}}/projects/{{name}}
+id_format: locations/global/metricsScopes/{{metrics_scope}}/projects/{{name}}


I think we need an upgrade state function to make sure any of these resources that were created with the v1/ prefix are moved to the correct id format

modular-magician · 2023-07-14T21:41:53Z

Tests analytics

Total tests: 2857
Passed tests 2555
Skipped tests: 299
Affected tests: 3

Action taken

Found 3 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccComputeFirewallPolicyRule_multipleRules|TestAccMonitoringMonitoredProject_monitoringMonitoredProjectLongFormExample

Get to know how VCR tests work

modular-magician · 2023-07-14T21:48:23Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccMonitoringMonitoredProject_monitoringMonitoredProjectLongFormExample[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

modular-magician · 2023-07-14T22:59:53Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 111 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 3 files changed, 111 insertions(+), 9 deletions(-))
TF Conversion: Diff ( 3 files changed, 4 insertions(+), 3 deletions(-))

modular-magician · 2023-07-15T00:25:01Z

Tests analytics

Total tests: 2861
Passed tests 2560
Skipped tests: 299
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccComputeFirewallPolicyRule_multipleRules

Get to know how VCR tests work

modular-magician · 2023-07-15T00:27:53Z

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

slevenick

LGTM, I tried out the upgrade path from 4.70.0 --> 4.73.1 --> this version manually and it works

* Normalize name field * Fix import * Support previous import id * Also shorten name in encoder * Add long form test * Add upgrade state function

trodge requested a review from zli82016 July 14, 2023 19:47

zli82016 mentioned this pull request Jul 14, 2023

Re-creation of existing google_monitoring_monitored_project resource when upgrading from v4.72.1 to v4.73.0 hashicorp/terraform-provider-google#15117

Closed

zli82016 requested a review from slevenick July 14, 2023 21:11

slevenick requested changes Jul 14, 2023

View reviewed changes

trodge added 6 commits July 14, 2023 15:10

Normalize name field

2c5b51e

Fix import

fff5a61

Support previous import id

48bebad

Also shorten name in encoder

98147da

Add long form test

c928355

Add upgrade state function

1c2aedb

trodge force-pushed the monitoring-monitored-project branch from 238962d to 1c2aedb Compare July 14, 2023 22:39

trodge requested a review from slevenick July 14, 2023 22:40

slevenick approved these changes Jul 15, 2023

View reviewed changes

trodge merged commit a779650 into GoogleCloudPlatform:main Jul 15, 2023

trodge deleted the monitoring-monitored-project branch July 15, 2023 00:55

This was referenced Jul 15, 2023

Normalize name field hashicorp/terraform-provider-google-beta#5905

Merged

Normalize name field hashicorp/terraform-provider-google#15190

Merged

Normalize name field GoogleCloudPlatform/terraform-google-conversion#1169

Merged

Uh oh!

Conversation

trodge commented Jul 14, 2023

Uh oh!

zli82016 commented Jul 14, 2023

Uh oh!

modular-magician commented Jul 14, 2023

Diff report

Uh oh!

modular-magician commented Jul 14, 2023

Diff report

Uh oh!

zli82016 commented Jul 14, 2023

Uh oh!

slevenick Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

trodge Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

slevenick Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

modular-magician commented Jul 14, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jul 14, 2023

Rerun these tests in REPLAYING mode to catch issues

Uh oh!

modular-magician commented Jul 14, 2023

Diff report

Uh oh!

modular-magician commented Jul 15, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jul 15, 2023

Uh oh!

slevenick left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants