From dbe49525168dfb59d6a0846d1fb1666615e76afc Mon Sep 17 00:00:00 2001 From: Sarah French Date: Tue, 5 Sep 2023 14:28:43 +0100 Subject: [PATCH] Update `FrameworkProviderConfig` to use plugin framework types package for `UserProjectOverride` boolean --- mmv1/third_party/terraform/fwtransport/framework_config.go.erb | 3 ++- mmv1/third_party/terraform/fwtransport/framework_transport.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/fwtransport/framework_config.go.erb b/mmv1/third_party/terraform/fwtransport/framework_config.go.erb index 84ac382b79ce..a4c2678fdf65 100644 --- a/mmv1/third_party/terraform/fwtransport/framework_config.go.erb +++ b/mmv1/third_party/terraform/fwtransport/framework_config.go.erb @@ -44,7 +44,7 @@ type FrameworkProviderConfig struct { Scopes []string TokenSource oauth2.TokenSource UserAgent string - UserProjectOverride bool + UserProjectOverride types.Bool // paths for client setup <% products.each do |product| -%> @@ -101,6 +101,7 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context, p.Project = data.Project p.Region = data.Region p.Zone = data.Zone + p.UserProjectOverride = data.UserProjectOverride p.PollInterval = 10 * time.Second p.RequestBatcherServiceUsage = transport_tpg.NewRequestBatcher("Service Usage", ctx, batchingConfig) p.RequestBatcherIam = transport_tpg.NewRequestBatcher("IAM", ctx, batchingConfig) diff --git a/mmv1/third_party/terraform/fwtransport/framework_transport.go b/mmv1/third_party/terraform/fwtransport/framework_transport.go index 43be9acd05ec..9764518c506b 100644 --- a/mmv1/third_party/terraform/fwtransport/framework_transport.go +++ b/mmv1/third_party/terraform/fwtransport/framework_transport.go @@ -23,7 +23,7 @@ func SendFrameworkRequestWithTimeout(p *FrameworkProviderConfig, method, project reqHeaders.Set("User-Agent", userAgent) reqHeaders.Set("Content-Type", "application/json") - if p.UserProjectOverride && project != "" { + if p.UserProjectOverride.ValueBool() && project != "" { // When project is "NO_BILLING_PROJECT_OVERRIDE" in the function GetCurrentUserEmail, // set the header X-Goog-User-Project to be empty string. if project == "NO_BILLING_PROJECT_OVERRIDE" {