Skip to content

Commit dbe4952

Browse files
committed
Update FrameworkProviderConfig to use plugin framework types package for UserProjectOverride boolean
1 parent 3854ebd commit dbe4952

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

mmv1/third_party/terraform/fwtransport/framework_config.go.erb

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type FrameworkProviderConfig struct {
4444
Scopes []string
4545
TokenSource oauth2.TokenSource
4646
UserAgent string
47-
UserProjectOverride bool
47+
UserProjectOverride types.Bool
4848

4949
// paths for client setup
5050
<% products.each do |product| -%>
@@ -101,6 +101,7 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
101101
p.Project = data.Project
102102
p.Region = data.Region
103103
p.Zone = data.Zone
104+
p.UserProjectOverride = data.UserProjectOverride
104105
p.PollInterval = 10 * time.Second
105106
p.RequestBatcherServiceUsage = transport_tpg.NewRequestBatcher("Service Usage", ctx, batchingConfig)
106107
p.RequestBatcherIam = transport_tpg.NewRequestBatcher("IAM", ctx, batchingConfig)

mmv1/third_party/terraform/fwtransport/framework_transport.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func SendFrameworkRequestWithTimeout(p *FrameworkProviderConfig, method, project
2323
reqHeaders.Set("User-Agent", userAgent)
2424
reqHeaders.Set("Content-Type", "application/json")
2525

26-
if p.UserProjectOverride && project != "" {
26+
if p.UserProjectOverride.ValueBool() && project != "" {
2727
// When project is "NO_BILLING_PROJECT_OVERRIDE" in the function GetCurrentUserEmail,
2828
// set the header X-Goog-User-Project to be empty string.
2929
if project == "NO_BILLING_PROJECT_OVERRIDE" {

0 commit comments

Comments
 (0)