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

Move Cloud Build Worker Pool to GA. #5356

Merged
merged 5 commits into from
Nov 22, 2021
Merged

Move Cloud Build Worker Pool to GA. #5356

merged 5 commits into from
Nov 22, 2021

Conversation

nat-henderson
Copy link
Contributor

@nat-henderson nat-henderson commented Oct 21, 2021

Note: this includes some unusual changes in the DCL due to deviations between the beta and GA APIs. Hopefully that oddness should be completely hidden from Terraform - if you see something that looks weird let me know, it is probably a symptom of incomplete conversion between beta and GA and should be fixed.

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)

google_cloudbuild_worker_pool in GA.
cloudbuild: added display_name and annotations to google_cloudbuild_worker_pool for compatibility with new GA.

@google-cla google-cla bot added the cla: yes label Oct 21, 2021
@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 ( 9 files changed, 762 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 2 files changed, 9 insertions(+), 1 deletion(-))
TF Validator: Diff ( 1 file changed, 2 insertions(+))

@nat-henderson
Copy link
Contributor Author

Okay - looks like we just need to remove Annotations, Display Name, Etag, and Uid from the GA version, because they are not in beta. Or, we'll need to get them added to beta. Either would be fine. I'll consult with the team.

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccComputeFirewallPolicyRule_update|TestAccSqlUser_postgresIAM You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=211847

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode: TestAccComputeFirewallPolicyRule_update|TestAccSqlUser_postgresIAM Please fix these to complete your PR

@nat-henderson
Copy link
Contributor Author

The team is going to get those features backported to the beta to maintain our rule about GA being a strict subset of beta. This PR will sit in draft til that's rolled out. :)

Note: this includes some unusual changes due to deviations between the beta and GA APIs.
@nat-henderson nat-henderson marked this pull request as ready for review November 8, 2021 21:40
@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 ( 9 files changed, 757 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 48 insertions(+), 1 deletion(-))
TF Validator: Diff ( 1 file changed, 2 insertions(+))

Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

👍 assuming the tests pass in GA

We may want to exclude etag as it is handled internally by the DCL and is not useful for users.

You're adding a couple fields to the beta resource, can you add that to the changelog note?

@slevenick slevenick self-requested a review November 15, 2021 23:10
Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Per discussion in chat: We should block merging this until we can move the beta provider to use the GA endpoints. Currently this resource in the beta provider requires users to be allow-listed. We should move the beta provider to use the GA endpoints to get around this

@nat-henderson
Copy link
Contributor Author

Okay - that should work - we'll see what the tests have to say. :)

@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 ( 9 files changed, 753 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 41 insertions(+), 1 deletion(-))
TF Validator: Diff ( 1 file changed, 2 insertions(+))

@slevenick
Copy link
Contributor

/gcbrun

Looks like it got stuck in the 5:00 runs.

@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 ( 9 files changed, 753 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 41 insertions(+), 1 deletion(-))
TF Validator: Diff ( 1 file changed, 2 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccCloudbuildWorkerPool_basic|TestAccCloudbuildWorkerPool_withNetwork|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccEventarcTrigger_BasicHandWritten|TestAccSqlUser_postgresIAM You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=221562

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode: TestAccEventarcTrigger_BasicHandWritten|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccSqlUser_postgresIAM Please fix these to complete your PR

@slevenick slevenick self-requested a review November 19, 2021 20:48
Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Looks like it's hitting the v1 endpoints for beta, and tests pass so we should be good to go!

betsy-lichtenberg pushed a commit to betsy-lichtenberg/magic-modules that referenced this pull request Apr 25, 2022
* Move Cloud Build Worker Pool to GA.

Note: this includes some unusual changes due to deviations between the beta and GA APIs.

* upgrade dcl.

* finish removing version gate.

* Use new GA / Beta versions, neither of which is ACL'd.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants