Shared reservation update #5653

simamGit · 2022-01-26T21:25:16Z

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.

Release Note Template for Downstream PRs (will be copied)

compute: added update support for `google_compute_reservation.share_settings`

modular-magician · 2022-01-26T21:25:32Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in /~https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

modular-magician · 2022-01-26T21:26:12Z

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

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@megan07, please review this PR or find an appropriate assignee.

simamGit · 2022-01-26T21:28:11Z

this test: "mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go" is failing.
generally these changes trying to update projectMaps of Shared Reservation. but the test is not recognizing the update, it keep deleting the current sharedReservation .
also this change is temporary: mmv1/templates/terraform/update_encoder/reservation.go.erb, I only tried it to see if it helps, but generally it is not correct change, since it causes resizing test failure.

I would be thankful if help me to figure out what part is wrong or how I can fix it.

simamGit · 2022-01-26T21:32:58Z

this test: "mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go" is failing. generally these changes trying to update projectMaps of Shared Reservation. but the test is not recognizing the update, it keep deleting the current sharedReservation . I would be thankful if help me to figure out what part is wrong or how I can fix it.

modular-magician · 2022-01-26T22:03:51Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in /~https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

rileykarson · 2022-01-27T17:33:41Z

Ah, generate-diffs failed due to a breakage in an unrelated PR. If you're able to rebase and push, this should generate successfully.

rileykarson · 2022-01-27T17:54:46Z

Ah, wait, a rebase won't work quite yet- #5659 needs to get in.

ScottSuarez · 2022-01-27T18:16:59Z

/gcbrun

modular-magician · 2022-01-27T23:34:31Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
TF Validator: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))

simamGit · 2022-01-28T23:28:12Z

Ah, wait, a rebase won't work quite yet- #5659 needs to get in.

test is failing with this error message:

    provider_test.go:278: ImportStateVerify attributes not equivalent. Difference is shown below. Top is actual, bottom is expected.
        
        (map[string]string) {
        }
        
        
        (map[string]string) (len=7) {
         (string) (len=16) "share_settings.#": (string) (len=1) "1",
         (string) (len=18) "share_settings.0.%": (string) (len=1) "2",
         (string) (len=30) "share_settings.0.project_map.#": (string) (len=1) "1",
         (string) (len=32) "share_settings.0.project_map.0.%": (string) (len=1) "2",
         (string) (len=33) "share_settings.0.project_map.0.id": (string) (len=19) "tf-test-296988n6za3",
         (string) (len=41) "share_settings.0.project_map.0.project_id": (string) (len=19) "tf-test-296988n6za3",
         (string) (len=27) "share_settings.0.share_type": (string) (len=17) "SPECIFIC_PROJECTS"
        }

modular-magician · 2022-01-28T23:39:52Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
TF Validator: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))

rileykarson

That error indicates that the settings aren't getting read back from the API correctly. I can inspect myself w/ test logs, we've just gotta pass the linter to get those. See inline.

mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go

modular-magician · 2022-01-31T21:49:19Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
TF Validator: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))

rileykarson · 2022-01-31T21:55:12Z

/gcbrun

modular-magician · 2022-01-31T22:09:18Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))
TF Validator: Diff ( 2 files changed, 214 insertions(+), 6 deletions(-))

simamGit · 2022-02-09T01:52:13Z

the update test is working now for delete and add projects to the projectMap.
1- added "share_settings" to ImportStateVerifyIgnore list for all update test configuration. please let me know if it is wrong.
2- the test is running in my local terraform-provider. I have updated the pre_update but I do not know why the "boundle" command is not working correctly. it does not merge pre_update code (shared_reservation_update.go.erb) with resource_copmpute_reservation.go.

mmv1/products/compute/terraform.yaml

mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go

modular-magician · 2022-02-18T19:54:37Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2022-02-19T02:51:25Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2022-02-22T19:14:15Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

rileykarson · 2022-02-22T19:29:10Z

/gcbrun

modular-magician · 2022-02-22T19:41:55Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2022-02-22T21:35:04Z

Tests were added that did not run in TeamCity:

TestAccComputeSharedReservation_update

modular-magician · 2022-02-22T21:35:06Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccCloudbuildWorkerPool_basic|TestAccContainerCluster_withAuthenticatorGroupsConfig You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=260307

rileykarson

The test passed! 🎉

Got a few questions / comments, main blocker is the error during the call to the resourcemanager API

mmv1/products/compute/api.yaml

mmv1/templates/terraform/update_encoder/reservation.go.erb

mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go

simamGit · 2022-02-23T22:12:11Z

Thanks Riley for all the feedback, they applied and code is already pushed. I resolved all the conversations, but not sure who has to press the resolve conversion button!

rileykarson · 2022-02-23T22:21:10Z

Resolve conversation's the same thing as Done in Critique, you're good to press it!

I don't expect the result to change, just running the test one more time.

modular-magician · 2022-02-23T22:23:13Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 2 files changed, 401 insertions(+), 14 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

rileykarson

Oh wait, I think we need to apply input: true to some more fields. In /~https://github.com/modular-magician/terraform-provider-google-beta/compare/auto-pr-5653-old..auto-pr-5653 you can see numerous unrelated fields losing ForceNew: true.

modular-magician · 2022-02-28T19:33:08Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 401 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 2 files changed, 401 insertions(+), 6 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

simamGit added 2 commits January 25, 2022 21:59

just test git

a62739c

add sharedReservation Update.

4e66486

modular-magician requested a review from megan07 January 26, 2022 21:26

simamGit closed this Jan 26, 2022

rileykarson reopened this Jan 26, 2022

rileykarson requested review from rileykarson and removed request for megan07 January 26, 2022 22:03

Merge branch 'GoogleCloudPlatform:master' into sharedReservationUpdate

0b805bb

replacing Number wo=ith project_id.

1c1ec4c

rileykarson reviewed Jan 31, 2022

View reviewed changes

mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go Show resolved Hide resolved

formatting test file.

3594f0f

simamGit added 2 commits February 9, 2022 01:35

fix tests and updateMask.

160f72d

fix resize and update.

cec56bd

rileykarson reviewed Feb 9, 2022

View reviewed changes

mmv1/products/compute/terraform.yaml Show resolved Hide resolved

fixing updateMask and project_map.

340a4e0

simamGit commented Feb 18, 2022

View reviewed changes

mmv1/third_party/terraform/tests/resource_compute_shared_reservation_update_test.go Show resolved Hide resolved

moving orgpolicy to the begining of the test.

e027e79

simamGit added 2 commits February 19, 2022 02:34

correct a description.

2de6ddf

fix a description.

ca68a59

changing org policy location in test.

51e77d9

rileykarson reviewed Feb 23, 2022

View reviewed changes

Apply Riley recomendation on the code.

cd6a238

rileykarson approved these changes Feb 25, 2022

View reviewed changes

rileykarson requested changes Feb 25, 2022

View reviewed changes

add input=true to more feilds.

0ae38b7

rileykarson approved these changes Mar 1, 2022

View reviewed changes

rileykarson merged commit dbadfce into GoogleCloudPlatform:master Mar 1, 2022

This was referenced Mar 1, 2022

Shared reservation update hashicorp/terraform-provider-google#11202

Merged

Shared reservation update hashicorp/terraform-provider-google-beta#4092

Merged

Shared reservation update GoogleCloudPlatform/terraform-validator#556

Merged

lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 16, 2022

Shared reservation update (GoogleCloudPlatform#5653)

0867f96

lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 17, 2022

Shared reservation update (GoogleCloudPlatform#5653)

40d001f

lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 18, 2022

Shared reservation update (GoogleCloudPlatform#5653)

97e25f7

betsy-lichtenberg pushed a commit to betsy-lichtenberg/magic-modules that referenced this pull request Apr 25, 2022

Shared reservation update (GoogleCloudPlatform#5653)

b7166b2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shared reservation update #5653

Shared reservation update #5653

simamGit commented Jan 26, 2022 •

edited by rileykarson

Loading

modular-magician commented Jan 26, 2022

modular-magician commented Jan 26, 2022

simamGit commented Jan 26, 2022 •

edited

Loading

simamGit commented Jan 26, 2022

modular-magician commented Jan 26, 2022

rileykarson commented Jan 27, 2022

rileykarson commented Jan 27, 2022

ScottSuarez commented Jan 27, 2022

modular-magician commented Jan 27, 2022

simamGit commented Jan 28, 2022

modular-magician commented Jan 28, 2022

rileykarson left a comment •

edited

Loading

modular-magician commented Jan 31, 2022

rileykarson commented Jan 31, 2022

modular-magician commented Jan 31, 2022

simamGit commented Feb 9, 2022

modular-magician commented Feb 18, 2022

modular-magician commented Feb 19, 2022

modular-magician commented Feb 22, 2022

rileykarson commented Feb 22, 2022

modular-magician commented Feb 22, 2022

modular-magician commented Feb 22, 2022

modular-magician commented Feb 22, 2022

rileykarson left a comment

simamGit commented Feb 23, 2022 •

edited

Loading

rileykarson commented Feb 23, 2022

modular-magician commented Feb 23, 2022

rileykarson left a comment

modular-magician commented Feb 28, 2022

Shared reservation update #5653

Shared reservation update #5653

Conversation

simamGit commented Jan 26, 2022 • edited by rileykarson Loading

modular-magician commented Jan 26, 2022

modular-magician commented Jan 26, 2022

simamGit commented Jan 26, 2022 • edited Loading

simamGit commented Jan 26, 2022

modular-magician commented Jan 26, 2022

rileykarson commented Jan 27, 2022

rileykarson commented Jan 27, 2022

ScottSuarez commented Jan 27, 2022

modular-magician commented Jan 27, 2022

Diff report:

simamGit commented Jan 28, 2022

modular-magician commented Jan 28, 2022

Diff report:

rileykarson left a comment • edited Loading

Choose a reason for hiding this comment

modular-magician commented Jan 31, 2022

Diff report:

rileykarson commented Jan 31, 2022

modular-magician commented Jan 31, 2022

Diff report:

simamGit commented Feb 9, 2022

modular-magician commented Feb 18, 2022

Diff report:

modular-magician commented Feb 19, 2022

Diff report:

modular-magician commented Feb 22, 2022

Diff report:

rileykarson commented Feb 22, 2022

modular-magician commented Feb 22, 2022

Diff report:

modular-magician commented Feb 22, 2022

modular-magician commented Feb 22, 2022

rileykarson left a comment

Choose a reason for hiding this comment

simamGit commented Feb 23, 2022 • edited Loading

rileykarson commented Feb 23, 2022

modular-magician commented Feb 23, 2022

Diff report:

rileykarson left a comment

Choose a reason for hiding this comment

modular-magician commented Feb 28, 2022

Diff report:

simamGit commented Jan 26, 2022 •

edited by rileykarson

Loading

simamGit commented Jan 26, 2022 •

edited

Loading

rileykarson left a comment •

edited

Loading

simamGit commented Feb 23, 2022 •

edited

Loading