support billing_project for `google_project_service` #5215

ScottSuarez · 2021-09-17T21:03:14Z

helps with hashicorp/terraform-provider-google#9489

Release Note Template for Downstream PRs (will be copied)

project: support `billing_project` for `google_project_service`

modular-magician · 2021-09-17T21:21:40Z

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

Diff report:

Terraform GA: Diff ( 4 files changed, 75 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 4 files changed, 75 insertions(+), 15 deletions(-))
TF Conversion: Diff ( 1 file changed, 14 insertions(+))

modular-magician · 2021-09-17T23:08:21Z

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

modular-magician · 2021-09-17T23:17:57Z

Tests failed during RECORDING mode: TestAccComputeServiceAttachment_serviceAttachmentBasicExample Please fix these to complete your PR

mmv1/third_party/terraform/utils/error_retry_predicates.go

modular-magician · 2021-09-21T19:00:30Z

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

Diff report:

Terraform GA: Diff ( 4 files changed, 76 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 5 files changed, 77 insertions(+), 16 deletions(-))
TF Conversion: Diff ( 1 file changed, 15 insertions(+))

mmv1/third_party/terraform/resources/resource_google_project.go

…-modules into fix-service-usage-403

modular-magician · 2021-09-21T21:10:30Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 60 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 3 files changed, 60 insertions(+), 15 deletions(-))

mmv1/third_party/terraform/resources/resource_google_project.go

ScottSuarez · 2021-09-22T22:34:14Z

/gcbrun

ScottSuarez · 2021-09-22T22:46:15Z

/gcbrun

modular-magician · 2021-09-22T22:57:28Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 60 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 4 files changed, 61 insertions(+), 17 deletions(-))

…-modules into fix-service-usage-403

ScottSuarez · 2021-09-23T00:17:50Z

mmv1/third_party/terraform/resources/resource_google_project.go

@@ -212,7 +225,13 @@ func resourceGoogleProjectCheckPreRequisites(config *Config, d *schema.ResourceD
 		return fmt.Errorf("missing permission on %q: %v", ba, perm)
 	}
 	if !d.Get("auto_create_network").(bool) {
-		_, err := config.NewServiceUsageClient(userAgent).Services.Get("projects/00000000000/services/serviceusage.googleapis.com").Do()
+		call := config.NewServiceUsageClient(userAgent).Services.Get("projects/00000000000/services/serviceusage.googleapis.com")


unsure if this call needs billing project passed. I am unsure of the exact purpose here.
@rileykarson

I believe it does!

modular-magician · 2021-09-23T00:26:47Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 84 insertions(+), 30 deletions(-))
Terraform Beta: Diff ( 4 files changed, 84 insertions(+), 29 deletions(-))

ScottSuarez · 2021-09-23T17:36:52Z

/gcbrun

modular-magician · 2021-09-23T17:48:13Z

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

Diff report:

Terraform GA: Diff ( 4 files changed, 84 insertions(+), 29 deletions(-))
Terraform Beta: Diff ( 6 files changed, 86 insertions(+), 32 deletions(-))

modular-magician · 2021-09-23T20:54:41Z

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

rileykarson

I ended up in a veritable rabbit hole during review on this! Comments inline, tl;dr our documentation lied and this resource behaves even more weirdly than expected.

rileykarson · 2021-09-24T17:50:55Z

mmv1/third_party/terraform/resources/resource_google_project.go

@@ -212,7 +225,13 @@ func resourceGoogleProjectCheckPreRequisites(config *Config, d *schema.ResourceD
 		return fmt.Errorf("missing permission on %q: %v", ba, perm)
 	}
 	if !d.Get("auto_create_network").(bool) {
-		_, err := config.NewServiceUsageClient(userAgent).Services.Get("projects/00000000000/services/serviceusage.googleapis.com").Do()
+		call := config.NewServiceUsageClient(userAgent).Services.Get("projects/00000000000/services/serviceusage.googleapis.com")


I believe it does!

mmv1/third_party/terraform/resources/resource_google_project.go

…-modules into fix-service-usage-403

modular-magician · 2021-10-12T19:48:07Z

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

Diff report:

Terraform GA: Diff ( 4 files changed, 86 insertions(+), 32 deletions(-))
Terraform Beta: Diff ( 5 files changed, 87 insertions(+), 33 deletions(-))

modular-magician · 2021-10-12T23:02:40Z

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

rileykarson

Alright, I think this LGTM.

It could be worth playing through a few scenarios locally, and making sure the billing project being used is the right one. I've found that an extremely useful verification on similar changes- making myself enumerate the obvious scenarios will end up with me checking up on a less obvious one!

ScottSuarez added 2 commits September 17, 2021 13:59

retry on service usage 403 and support billing_project

0d17df7

fix linting errors

136bb10

ScottSuarez requested a review from rileykarson September 17, 2021 21:03

google-cla bot added the cla: yes label Sep 17, 2021

ScottSuarez added 2 commits September 17, 2021 14:09

set billing project for project creation service call

906bb7d

lint error fix

d2fed44

rileykarson reviewed Sep 21, 2021

View reviewed changes

mmv1/third_party/terraform/utils/error_retry_predicates.go Outdated Show resolved Hide resolved

specify guard to be more narrow

bdfa723

ScottSuarez requested a review from rileykarson September 21, 2021 18:49

rileykarson reviewed Sep 21, 2021

View reviewed changes

mmv1/third_party/terraform/resources/resource_google_project.go Outdated Show resolved Hide resolved

mmv1/third_party/terraform/resources/resource_google_project.go Show resolved Hide resolved

ScottSuarez added 2 commits September 21, 2021 13:51

Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…

a7414b4

…-modules into fix-service-usage-403

remove retry code

864db4b

ScottSuarez changed the title ~~retry on service usage 403 and support billing_project for google_project_service~~ support billing_project for google_project_service Sep 21, 2021

ScottSuarez requested a review from rileykarson September 21, 2021 21:02

rileykarson reviewed Sep 21, 2021

View reviewed changes

mmv1/third_party/terraform/resources/resource_google_project.go Show resolved Hide resolved

ScottSuarez added 2 commits September 22, 2021 17:10

Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…

ed08060

…-modules into fix-service-usage-403

update all reference to add billing project

0917be8

ScottSuarez requested a review from rileykarson September 23, 2021 00:17

ScottSuarez commented Sep 23, 2021

View reviewed changes

rileykarson reviewed Sep 24, 2021

View reviewed changes

ScottSuarez added 2 commits October 12, 2021 12:31

Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…

a2bcf65

…-modules into fix-service-usage-403

use billing project with polling operation

13211a1

ScottSuarez requested a review from rileykarson October 12, 2021 19:36

rileykarson approved these changes Oct 14, 2021

View reviewed changes

ScottSuarez merged commit 06837b4 into GoogleCloudPlatform:master Oct 25, 2021

ScottSuarez deleted the fix-service-usage-403 branch October 25, 2021 17:26

This was referenced Oct 25, 2021

support billing_project for google_project_service hashicorp/terraform-provider-google-beta#3768

Merged

support billing_project for google_project_service hashicorp/terraform-provider-google#10395

Merged

shuyama1 mentioned this pull request Feb 23, 2022

Investigate TestAccProjectService_basic failure when using user_project_override hashicorp/terraform-provider-google#11153

Open

rileykarson mentioned this pull request Mar 28, 2024

Support billing_project in google_project_service hashicorp/terraform-provider-google#7660

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support billing_project for `google_project_service` #5215

support billing_project for `google_project_service` #5215

ScottSuarez commented Sep 17, 2021 •

edited

Loading

modular-magician commented Sep 17, 2021

modular-magician commented Sep 17, 2021

modular-magician commented Sep 17, 2021

modular-magician commented Sep 21, 2021

modular-magician commented Sep 21, 2021

ScottSuarez commented Sep 22, 2021

ScottSuarez commented Sep 22, 2021

modular-magician commented Sep 22, 2021

ScottSuarez Sep 23, 2021

rileykarson Sep 24, 2021

modular-magician commented Sep 23, 2021

ScottSuarez commented Sep 23, 2021

modular-magician commented Sep 23, 2021

modular-magician commented Sep 23, 2021

rileykarson left a comment

rileykarson Sep 24, 2021

modular-magician commented Oct 12, 2021

modular-magician commented Oct 12, 2021

rileykarson left a comment

support billing_project for google_project_service #5215

support billing_project for google_project_service #5215

Conversation

ScottSuarez commented Sep 17, 2021 • edited Loading

modular-magician commented Sep 17, 2021

Diff report:

modular-magician commented Sep 17, 2021

modular-magician commented Sep 17, 2021

modular-magician commented Sep 21, 2021

Diff report:

modular-magician commented Sep 21, 2021

Diff report:

ScottSuarez commented Sep 22, 2021

ScottSuarez commented Sep 22, 2021

modular-magician commented Sep 22, 2021

Diff report:

ScottSuarez Sep 23, 2021

Choose a reason for hiding this comment

rileykarson Sep 24, 2021

Choose a reason for hiding this comment

modular-magician commented Sep 23, 2021

Diff report:

ScottSuarez commented Sep 23, 2021

modular-magician commented Sep 23, 2021

Diff report:

modular-magician commented Sep 23, 2021

rileykarson left a comment

Choose a reason for hiding this comment

rileykarson Sep 24, 2021

Choose a reason for hiding this comment

modular-magician commented Oct 12, 2021

Diff report:

modular-magician commented Oct 12, 2021

rileykarson left a comment

Choose a reason for hiding this comment

support billing_project for `google_project_service` #5215

support billing_project for `google_project_service` #5215

ScottSuarez commented Sep 17, 2021 •

edited

Loading