CloudBuild V2 Connection IAM resources #6778

mariomachado94 · 2022-11-03T21:20:34Z

Depends on PR#6756

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_cloudbuildv2_connection_iam_policy` (beta)

`google_cloudbuildv2_connection_iam_binding` (beta)

`google_cloudbuildv2_connection_iam_member` (beta)

vicpadilla · 2022-11-07T16:49:46Z

tpgtools/api/cloudbuildv2/samples/ghe.repository.json

@@ -0,0 +1,10 @@
+{


Why are these examples necessary for the IAM resources?

Isn't this feature for the private provider? I see it's being added to magic-modules beta.

Those commits are actually from #6756. The connection IAM specific changes are in the single most recent commit

modular-magician · 2023-01-12T16:44:08Z

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, 667 insertions(+))
Terraform Beta: Diff ( 18 files changed, 3110 insertions(+), 7 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-01-12T17:44:15Z

Tests analytics

Total tests: 2416
Passed tests 2154
Skipped tests: 251
Failed tests: 11

Action taken

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

TestAccCloudbuildv2Connection_GithubConnection|TestAccCloudbuildv2Connection_GhePrivUpdateConnection|TestAccCloudbuildv2Connection_GhePrivConnection|TestAccCloudbuildv2Connection_GheConnection|TestAccCloudbuildv2Connection_GheCompleteConnection|TestAccCloudbuildv2Repository_GithubRepository|TestAccCloudbuildv2Repository_GheRepository|TestAccCloudBuildv2ConnectionIamPolicyGenerated|TestAccCloudBuildv2ConnectionIamMemberGenerated|TestAccCloudBuildv2ConnectionIamBindingGenerated|TestAccContainerCluster_withInvalidGatewayApiConfigChannel

modular-magician · 2023-01-12T17:44:41Z

Tests passed during RECORDING mode:
TestAccContainerCluster_withInvalidGatewayApiConfigChannel[Debug log]

Tests failed during RECORDING mode:
TestAccCloudbuildv2Connection_GithubConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GhePrivUpdateConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GhePrivConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GheConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GheCompleteConnection[Error message] [Debug log]
TestAccCloudbuildv2Repository_GithubRepository[Error message] [Debug log]
TestAccCloudbuildv2Repository_GheRepository[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamPolicyGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamMemberGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamBindingGenerated[Error message] [Debug log]

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

modular-magician · 2023-01-25T23:03:40Z

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, 667 insertions(+))
Terraform Beta: Diff ( 18 files changed, 3110 insertions(+), 7 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-01-25T23:44:20Z

Tests analytics

Total tests: 2439
Passed tests 2174
Skipped tests: 254
Failed tests: 11

Action taken

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

TestAccCloudBuildv2ConnectionIamPolicyGenerated|TestAccCloudBuildv2ConnectionIamMemberGenerated|TestAccCloudBuildv2ConnectionIamBindingGenerated|TestAccRegionInstanceGroupManager_stateful|TestAccCloudbuildv2Connection_GhePrivConnection|TestAccCloudbuildv2Connection_GheConnection|TestAccCloudbuildv2Connection_GheCompleteConnection|TestAccCloudbuildv2Repository_GithubRepository|TestAccCloudbuildv2Repository_GheRepository|TestAccCloudbuildv2Connection_GithubConnection|TestAccCloudbuildv2Connection_GhePrivUpdateConnection

modular-magician · 2023-01-25T23:48:06Z

Tests failed during RECORDING mode:
TestAccCloudBuildv2ConnectionIamPolicyGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamMemberGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamBindingGenerated[Error message] [Debug log]
TestAccRegionInstanceGroupManager_stateful[Error message] [Debug log]
TestAccCloudbuildv2Connection_GhePrivConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GheConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GheCompleteConnection[Error message] [Debug log]
TestAccCloudbuildv2Repository_GithubRepository[Error message] [Debug log]
TestAccCloudbuildv2Repository_GheRepository[Error message] [Debug log]
TestAccCloudbuildv2Connection_GithubConnection[Error message] [Debug log]
TestAccCloudbuildv2Connection_GhePrivUpdateConnection[Error message] [Debug log]

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

rileykarson · 2023-01-27T19:36:17Z

Note: We'll need to rebase on top of #7157 for this change!

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb

mariomachado94 · 2023-01-30T18:15:21Z

Rebased on top of main (includes #7157)

modular-magician · 2023-01-30T18:27:45Z

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 ( 1 file changed, 154 insertions(+))
Terraform Beta: Diff ( 6 files changed, 642 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-01-30T19:08:57Z

Tests analytics

Total tests: 2442
Passed tests 2183
Skipped tests: 254
Failed tests: 5

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_failedCreation|TestAccCloudBuildv2ConnectionIamBindingGenerated|TestAccCloudBuildv2ConnectionIamPolicyGenerated|TestAccCloudBuildv2ConnectionIamMemberGenerated

modular-magician · 2023-01-30T19:24:11Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccContainerCluster_failedCreation[Debug log]

Tests failed during RECORDING mode:
TestAccCloudBuildv2ConnectionIamBindingGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamPolicyGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamMemberGenerated[Error message] [Debug log]

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

rileykarson · 2023-01-30T22:15:46Z

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb

@@ -0,0 +1,16 @@
+provider "google-beta" {}


Suggested change

provider "google-beta" {}

I beleive this is added by the test framework implicitly, so we can exclude it! It's likely the source of the error right now:

Error: Duplicate provider configuration on terraform_plugin_test.tf line 3: 3: provider "google-beta" {} A default (non-aliased) provider configuration for "google-beta" was already given at terraform_plugin_test.tf:1,1-23. If multiple configurations are required, set the "alias" argument for alternative configurations. testing_new.go:73: Error retrieving state, there may be dangling resources: exit status 1 Error: Duplicate provider configuration on terraform_plugin_test.tf line 3: 3: provider "google-beta" {} A default (non-aliased) provider configuration for "google-beta" was already given at terraform_plugin_test.tf:1,1-23. If multiple configurations are required, set the "alias" argument for alternative configurations.

rileykarson · 2023-01-30T22:16:44Z

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb

@@ -0,0 +1,16 @@
+provider "google-beta" {}
+
+resource "google_project" "project" {


Do we need to use a new project here, or can we manage these resources in an existing one?

Removed project.

mmv1/products/cloudbuildv2/terraform.yaml

mmv1/products/cloudbuildv2/api.yaml

modular-magician · 2023-01-31T19:25:38Z

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 ( 1 file changed, 154 insertions(+))
Terraform Beta: Diff ( 6 files changed, 627 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-01-31T20:11:23Z

Tests analytics

Total tests: 2445
Passed tests 2186
Skipped tests: 254
Failed tests: 5

Action taken

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

TestAccRegionInstanceGroupManager_stateful|TestAccContainerCluster_failedCreation|TestAccCloudBuildv2ConnectionIamPolicyGenerated|TestAccCloudBuildv2ConnectionIamMemberGenerated|TestAccCloudBuildv2ConnectionIamBindingGenerated

modular-magician · 2023-01-31T20:27:06Z

Tests passed during RECORDING mode:
TestAccRegionInstanceGroupManager_stateful[Debug log]
TestAccContainerCluster_failedCreation[Debug log]
TestAccCloudBuildv2ConnectionIamBindingGenerated[Debug log]

Tests failed during RECORDING mode:
TestAccCloudBuildv2ConnectionIamPolicyGenerated[Error message] [Debug log]
TestAccCloudBuildv2ConnectionIamMemberGenerated[Error message] [Debug log]

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

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb

modular-magician · 2023-02-01T15:44:49Z

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 ( 1 file changed, 154 insertions(+))
Terraform Beta: Diff ( 6 files changed, 627 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-02-01T16:29:17Z

Tests analytics

Total tests: 2448
Passed tests 2188
Skipped tests: 254
Failed tests: 6

Action taken

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

TestAccRegionInstanceGroupManager_stateful|TestAccContainerCluster_failedCreation|TestAccFirebaserulesRelease_BasicRelease|TestAccCloudBuildv2ConnectionIamPolicyGenerated|TestAccCloudBuildv2ConnectionIamMemberGenerated|TestAccCloudBuildv2ConnectionIamBindingGenerated

modular-magician · 2023-02-01T16:44:24Z

Tests passed during RECORDING mode:
TestAccContainerCluster_failedCreation[Debug log]
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccCloudBuildv2ConnectionIamPolicyGenerated[Debug log]
TestAccCloudBuildv2ConnectionIamMemberGenerated[Debug log]
TestAccCloudBuildv2ConnectionIamBindingGenerated[Debug log]

Tests failed during RECORDING mode:
TestAccRegionInstanceGroupManager_stateful[Error message] [Debug log]

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

rileykarson

Generally LGTM. Noticed a minor inconsistency in some of the generated custom URL stuff- suggestions inline. Sorry for the extra round trip!

mmv1/products/cloudbuildv2/api.yaml

mmv1/products/cloudbuildv2/terraform.yaml

Co-authored-by: Riley Karson <[email protected]>

modular-magician · 2023-02-01T18:25:11Z

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 ( 1 file changed, 154 insertions(+))
Terraform Beta: Diff ( 6 files changed, 627 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-02-01T19:09:47Z

Tests analytics

Total tests: 2448
Passed tests 2188
Skipped tests: 254
Failed tests: 6

Action taken

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

TestAccFirebaserulesRelease_BasicRelease|TestAccRegionInstanceGroupManager_stateful|TestAccContainerCluster_failedCreation|TestAccCloudbuildv2ConnectionIamBindingGenerated|TestAccCloudbuildv2ConnectionIamMemberGenerated|TestAccCloudbuildv2ConnectionIamPolicyGenerated

modular-magician · 2023-02-01T19:25:24Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccContainerCluster_failedCreation[Debug log]

Tests failed during RECORDING mode:
TestAccRegionInstanceGroupManager_stateful[Error message] [Debug log]
TestAccCloudbuildv2ConnectionIamBindingGenerated[Error message] [Debug log]
TestAccCloudbuildv2ConnectionIamMemberGenerated[Error message] [Debug log]
TestAccCloudbuildv2ConnectionIamPolicyGenerated[Error message] [Debug log]

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

rileykarson

Those tests are newly failing for the right reason here! Both MMv1 and tpgtools (DCL) support custom basepaths, but they're not both compatible with each other- MMv1 configures a default URL in Terraform and uses that, assuming a URL is always present, while DCL stores the default internally and defaults to empty in Terraform. When they conflict, tpgtools wins, causing an empty URL.

tpgtools is compatible with MMv1's generated code- we end up overriding DCL's internal default with Terraform's (identical) default. We can turn off DCL generation. You should just need to add an override like

magic-modules/tpgtools/overrides/compute/tpgtools_product.yaml

Lines 3 to 5 in 4498a00

    
           - type: PRODUCT_BASE_PATH 
        
             details: 
        
               skip: true

to https://github.com/GoogleCloudPlatform/magic-modules/blob/main/tpgtools/overrides/cloudbuildv2/beta/tpgtools_product.yaml.

rileykarson · 2023-02-01T20:19:27Z

(normally we'd have a compilation error instead of the one we got, but actually hooking up the Terraform part for new DCL services is manual and we missed doing that for this Cloud Build v2)

modular-magician · 2023-02-02T16:32:46Z

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 ( 1 file changed, 154 insertions(+))
Terraform Beta: Diff ( 7 files changed, 627 insertions(+), 14 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

modular-magician · 2023-02-02T17:15:34Z

Tests analytics

Total tests: 2448
Passed tests 2189
Skipped tests: 255
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

TestAccRegionInstanceGroupManager_stateful|TestAccCloudbuildv2ConnectionIamPolicyGenerated|TestAccCloudbuildv2ConnectionIamMemberGenerated|TestAccCloudbuildv2ConnectionIamBindingGenerated

modular-magician · 2023-02-02T17:19:04Z

Tests passed during RECORDING mode:
TestAccCloudbuildv2ConnectionIamPolicyGenerated[Debug log]
TestAccCloudbuildv2ConnectionIamMemberGenerated[Debug log]
TestAccCloudbuildv2ConnectionIamBindingGenerated[Debug log]

Tests failed during RECORDING mode:
TestAccRegionInstanceGroupManager_stateful[Error message] [Debug log]

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

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb

Co-authored-by: Riley Karson <[email protected]> Co-authored-by: Mario Machado <[email protected]>

mariomachado94 requested a review from rileykarson as a code owner November 3, 2022 21:20

vicpadilla reviewed Nov 7, 2022

View reviewed changes

mariomachado94 mentioned this pull request Nov 7, 2022

Add support for google_cloudbuildv2_connection and google_cloudbuildv2_repository #6756

Closed

5 tasks

mariomachado94 force-pushed the connection-iam branch from 1c44f80 to d85c77a Compare November 14, 2022 17:17

mariomachado94 force-pushed the connection-iam branch from d85c77a to 62fa33e Compare January 12, 2023 16:29

mariomachado94 force-pushed the connection-iam branch from 62fa33e to cdc5e6b Compare January 25, 2023 22:48

vicpadilla reviewed Jan 27, 2023

View reviewed changes

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb Show resolved Hide resolved

mariomachado94 force-pushed the connection-iam branch from cdc5e6b to 301920d Compare January 30, 2023 18:12

rileykarson reviewed Jan 30, 2023

View reviewed changes

mariomachado94 force-pushed the connection-iam branch from 301920d to d79bfff Compare January 31, 2023 19:06

modular-magician requested a review from rileykarson January 31, 2023 19:07

rileykarson reviewed Jan 31, 2023

View reviewed changes

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb Outdated Show resolved Hide resolved

mariomachado94 force-pushed the connection-iam branch from e1e521d to 889e3f6 Compare February 1, 2023 15:24

modular-magician requested a review from rileykarson February 1, 2023 15:25

Adds cloudbuildv2_connection_iam resources

6ca37f3

mariomachado94 force-pushed the connection-iam branch from 889e3f6 to 6ca37f3 Compare February 1, 2023 15:28

rileykarson reviewed Feb 1, 2023

View reviewed changes

mmv1/products/cloudbuildv2/api.yaml Outdated Show resolved Hide resolved

mmv1/products/cloudbuildv2/terraform.yaml Outdated Show resolved Hide resolved

mariomachado94 and others added 2 commits February 1, 2023 13:09

Fix name in api.yaml

f3ea31d

Co-authored-by: Riley Karson <[email protected]>

Remove legacy_name in terraform.yaml

af937d1

Co-authored-by: Riley Karson <[email protected]>

modular-magician requested a review from rileykarson February 1, 2023 18:10

rileykarson reviewed Feb 1, 2023

View reviewed changes

Fix custom basepaths in cloudbuildv2

4f40132

modular-magician requested a review from rileykarson February 2, 2023 16:17

vicpadilla reviewed Feb 2, 2023

View reviewed changes

mmv1/templates/terraform/examples/cloudbuildv2_connection.tf.erb Show resolved Hide resolved

rileykarson approved these changes Feb 2, 2023

View reviewed changes

rileykarson merged commit a6654f2 into GoogleCloudPlatform:main Feb 2, 2023

SarahFrench mentioned this pull request Feb 7, 2023

Allow import steps in beta IAM resource tests #7185

Merged

5 tasks

kubalaguna pushed a commit to kubalaguna/magic-modules that referenced this pull request Feb 27, 2023

CloudBuild V2 Connection IAM resources (GoogleCloudPlatform#6778)

87a96d5

Co-authored-by: Riley Karson <[email protected]> Co-authored-by: Mario Machado <[email protected]>

ericayyliu pushed a commit to ericayyliu/magic-modules that referenced this pull request Jul 26, 2023

CloudBuild V2 Connection IAM resources (GoogleCloudPlatform#6778)

7f8aa78

Co-authored-by: Riley Karson <[email protected]> Co-authored-by: Mario Machado <[email protected]>

		@@ -0,0 +1,16 @@
		provider "google-beta" {}

		resource "google_project" "project" {

CloudBuild V2 Connection IAM resources #6778

CloudBuild V2 Connection IAM resources #6778

Uh oh!

Conversation

mariomachado94 commented Nov 3, 2022 • edited by rileykarson Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vicpadilla Nov 7, 2022

Choose a reason for hiding this comment

Uh oh!

mariomachado94 Nov 7, 2022

Choose a reason for hiding this comment

Uh oh!

modular-magician commented Jan 12, 2023

Diff report

Uh oh!

modular-magician commented Jan 12, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jan 12, 2023

Uh oh!

modular-magician commented Jan 25, 2023

Diff report

Uh oh!

modular-magician commented Jan 25, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jan 25, 2023

Uh oh!

rileykarson commented Jan 27, 2023

Uh oh!

Uh oh!

mariomachado94 commented Jan 30, 2023

Uh oh!

modular-magician commented Jan 30, 2023

Diff report

Uh oh!

modular-magician commented Jan 30, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jan 30, 2023

Uh oh!

rileykarson Jan 30, 2023

Choose a reason for hiding this comment

Uh oh!

rileykarson Jan 30, 2023

Choose a reason for hiding this comment

Uh oh!

mariomachado94 Jan 31, 2023

Choose a reason for hiding this comment

Uh oh!

rileykarson Jan 30, 2023

Choose a reason for hiding this comment

Uh oh!

mariomachado94 Jan 31, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

modular-magician commented Jan 31, 2023

Diff report

Uh oh!

modular-magician commented Jan 31, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jan 31, 2023

Uh oh!

Uh oh!

modular-magician commented Feb 1, 2023

Diff report

Uh oh!

modular-magician commented Feb 1, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Feb 1, 2023

mariomachado94 commented Nov 3, 2022 •

edited by rileykarson

Loading