Moved some clients from config.go to individual service packages (GoogleCloudPlatform#17276)

melinath · web-flow · commit bd4ed8b8d1a9 · 2026-04-24T16:50:10.000Z
diff --git a/mmv1/provider/terraform_tgc.go b/mmv1/provider/terraform_tgc.go
@@ -397,6 +397,7 @@ func (tgc TerraformGoogleConversion) CopyCommonFiles(outputFolder string, genera
 		"converters/google/resources/services/kms/kms_utils.go":                                 "third_party/terraform/services/kms/kms_utils.go",
 		"converters/google/resources/services/sourcerepo/source_repo_utils.go":                  "third_party/terraform/services/sourcerepo/source_repo_utils.go",
 		"converters/google/resources/services/pubsub/pubsub_utils.go":                           "third_party/terraform/services/pubsub/pubsub_utils.go",
+		"converters/google/resources/services/pubsub/client.go":                                 "third_party/terraform/services/pubsub/client.go",
 		"converters/google/resources/services/privateca/privateca_utils.go":                     "third_party/terraform/services/privateca/privateca_utils.go",
 		"converters/google/resources/services/bigquery/bigquery_dataset_iam.go":                 "third_party/tgc/services/bigquery/bigquery_dataset_iam.go",
 		"converters/google/resources/services/compute/compute_security_policy.go":               "third_party/tgc/services/compute/compute_security_policy.go",
diff --git a/mmv1/third_party/terraform/services/certificatemanager/client.go b/mmv1/third_party/terraform/services/certificatemanager/client.go
@@ -0,0 +1,23 @@
+package certificatemanager
+
+import (
+	"log"
+
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+	"google.golang.org/api/certificatemanager/v1"
+	"google.golang.org/api/option"
+)
+
+func NewClient(c *transport_tpg.Config, userAgent string) *certificatemanager.Service {
+	certificateManagerClientBasePath := transport_tpg.RemoveBasePathVersion(c.CertificateManagerBasePath)
+	log.Printf("[INFO] Instantiating Certificate Manager client for path %s", certificateManagerClientBasePath)
+	clientCertificateManager, err := certificatemanager.NewService(c.Context, option.WithHTTPClient(c.Client))
+	if err != nil {
+		log.Printf("[WARN] Error creating client certificate manager: %s", err)
+		return nil
+	}
+	clientCertificateManager.UserAgent = userAgent
+	clientCertificateManager.BasePath = certificateManagerClientBasePath
+
+	return clientCertificateManager
+}
diff --git a/mmv1/third_party/terraform/services/certificatemanager/data_source_google_certificate_manager_certificates.go b/mmv1/third_party/terraform/services/certificatemanager/data_source_google_certificate_manager_certificates.go
@@ -57,7 +57,7 @@ func dataSourceGoogleCertificateManagerCertificatesRead(d *schema.ResourceData,
 	filter := d.Get("filter").(string)
 
 	certificates := make([]map[string]interface{}, 0)
-	certificatesList, err := config.NewCertificateManagerClient(userAgent).Projects.Locations.Certificates.List(fmt.Sprintf("projects/%s/locations/%s", project, region)).Filter(filter).Do()
+	certificatesList, err := NewClient(config, userAgent).Projects.Locations.Certificates.List(fmt.Sprintf("projects/%s/locations/%s", project, region)).Filter(filter).Do()
 	if err != nil {
 		return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Certificates : %s %s", project, region))
 	}
diff --git a/mmv1/third_party/terraform/services/firebase/client.go.tmpl b/mmv1/third_party/terraform/services/firebase/client.go.tmpl
@@ -0,0 +1,28 @@
+package firebase
+{{- if ne $.TargetVersionName "ga" }}
+
+import (
+	"context"
+	"log"
+	"strings"
+
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+	firebase "google.golang.org/api/firebase/v1beta1"
+	"google.golang.org/api/option"
+)
+
+func NewClient(ctx context.Context, c *transport_tpg.Config, userAgent string) *firebase.Service {
+	firebaseClientBasePath := transport_tpg.RemoveBasePathVersion(c.FirebaseBasePath)
+	firebaseClientBasePath = strings.ReplaceAll(firebaseClientBasePath, "/firebase/", "")
+	log.Printf("[INFO] Instantiating Google Cloud firebase client for path %s", firebaseClientBasePath)
+	clientFirebase, err := firebase.NewService(c.Context, option.WithHTTPClient(c.Client))
+	if err != nil {
+		log.Printf("[WARN] Error creating client firebase: %s", err)
+		return nil
+	}
+	clientFirebase.UserAgent = userAgent
+	clientFirebase.BasePath = firebaseClientBasePath
+
+	return clientFirebase
+}
+{{- end }}
diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_admin_sdk_config.go.tmpl b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_admin_sdk_config.go.tmpl
@@ -93,7 +93,7 @@ func (d *GoogleFirebaseAdminSdkConfigDataSource) Configure(ctx context.Context,
 		return
 	}
 
-	p, ok := req.ProviderData.(*transport_tpg.Config)
+	config, ok := req.ProviderData.(*transport_tpg.Config)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
@@ -102,11 +102,11 @@ func (d *GoogleFirebaseAdminSdkConfigDataSource) Configure(ctx context.Context,
 		return
 	}
 
-	d.client = p.NewFirebaseClient(ctx, p.UserAgent)
+	d.client = NewClient(ctx, config, config.UserAgent)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	d.providerConfig = p
+	d.providerConfig = config
 }
 
 func (d *GoogleFirebaseAdminSdkConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config.go.tmpl b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config.go.tmpl
@@ -92,7 +92,7 @@ func (d *GoogleFirebaseAndroidAppConfigDataSource) Configure(ctx context.Context
 		return
 	}
 
-	p, ok := req.ProviderData.(*transport_tpg.Config)
+	config, ok := req.ProviderData.(*transport_tpg.Config)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
@@ -101,11 +101,11 @@ func (d *GoogleFirebaseAndroidAppConfigDataSource) Configure(ctx context.Context
 		return
 	}
 
-	d.client = p.NewFirebaseClient(ctx, p.UserAgent)
+	d.client = NewClient(ctx, config, config.UserAgent)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	d.providerConfig = p
+	d.providerConfig = config
 }
 
 func (d *GoogleFirebaseAndroidAppConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config.go.tmpl b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config.go.tmpl
@@ -92,7 +92,7 @@ func (d *GoogleFirebaseAppleAppConfigDataSource) Configure(ctx context.Context,
 		return
 	}
 
-	p, ok := req.ProviderData.(*transport_tpg.Config)
+	config, ok := req.ProviderData.(*transport_tpg.Config)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
@@ -101,11 +101,11 @@ func (d *GoogleFirebaseAppleAppConfigDataSource) Configure(ctx context.Context,
 		return
 	}
 
-	d.client = p.NewFirebaseClient(ctx, p.UserAgent)
+	d.client = NewClient(ctx, config, config.UserAgent)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	d.providerConfig = p
+	d.providerConfig = config
 }
 
 func (d *GoogleFirebaseAppleAppConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_web_app_config.go.tmpl b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_web_app_config.go.tmpl
@@ -139,7 +139,7 @@ func (d *GoogleFirebaseWebAppConfigDataSource) Configure(ctx context.Context, re
 		return
 	}
 
-	p, ok := req.ProviderData.(*transport_tpg.Config)
+	config, ok := req.ProviderData.(*transport_tpg.Config)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
@@ -148,11 +148,11 @@ func (d *GoogleFirebaseWebAppConfigDataSource) Configure(ctx context.Context, re
 		return
 	}
 
-	d.client = p.NewFirebaseClient(ctx, p.UserAgent)
+	d.client = NewClient(ctx, config, config.UserAgent)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	d.providerConfig = p
+	d.providerConfig = config
 }
 
 func (d *GoogleFirebaseWebAppConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
diff --git a/mmv1/third_party/terraform/services/pubsub/client.go b/mmv1/third_party/terraform/services/pubsub/client.go
@@ -0,0 +1,24 @@
+package pubsub
+
+import (
+	"log"
+
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+	"google.golang.org/api/option"
+	pubsub "google.golang.org/api/pubsub/v1"
+)
+
+func NewClient(c *transport_tpg.Config, userAgent string) *pubsub.Service {
+	pubsubClientBasePath := transport_tpg.RemoveBasePathVersion(c.PubsubBasePath)
+	log.Printf("[INFO] Instantiating Google Pubsub client for path %s", pubsubClientBasePath)
+	wrappedPubsubClient := transport_tpg.ClientWithAdditionalRetries(c.Client, transport_tpg.PubsubTopicProjectNotReady)
+	clientPubsub, err := pubsub.NewService(c.Context, option.WithHTTPClient(wrappedPubsubClient))
+	if err != nil {
+		log.Printf("[WARN] Error creating client pubsub: %s", err)
+		return nil
+	}
+	clientPubsub.UserAgent = userAgent
+	clientPubsub.BasePath = pubsubClientBasePath
+
+	return clientPubsub
+}
diff --git a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription.go.tmpl b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription.go.tmpl
@@ -64,7 +64,7 @@ func (u *PubsubSubscriptionIamUpdater) GetResourceIamPolicy() (*cloudresourceman
 		return nil, err
 	}
 
-	p, err := u.Config.NewPubsubClient(userAgent).Projects.Subscriptions.GetIamPolicy(u.subscription).Do()
+	p, err := NewClient(u.Config, userAgent).Projects.Subscriptions.GetIamPolicy(u.subscription).Do()
 
 	if err != nil {
 		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{"{{"}}err{{"}}"}}", u.DescribeResource()), err)
@@ -89,7 +89,7 @@ func (u *PubsubSubscriptionIamUpdater) SetResourceIamPolicy(policy *cloudresourc
 		return err
 	}
 
-	_, err = u.Config.NewPubsubClient(userAgent).Projects.Subscriptions.SetIamPolicy(u.subscription, &pubsub.SetIamPolicyRequest{
+	_, err = NewClient(u.Config, userAgent).Projects.Subscriptions.SetIamPolicy(u.subscription, &pubsub.SetIamPolicyRequest{
 		Policy: pubsubPolicy,
 	}).Do()
 
diff --git a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription_test.go b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription_test.go
@@ -118,7 +118,7 @@ func TestAccPubsubSubscriptionIamPolicy(t *testing.T) {
 func testAccCheckPubsubSubscriptionIam(t *testing.T, subscription, role string, members []string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		config := acctest.GoogleProviderConfig(t)
-		p, err := config.NewPubsubClient(config.UserAgent).Projects.Subscriptions.GetIamPolicy(pubsub.GetComputedSubscriptionName(envvar.GetTestProjectFromEnv(), subscription)).Do()
+		p, err := pubsub.NewClient(config, config.UserAgent).Projects.Subscriptions.GetIamPolicy(pubsub.GetComputedSubscriptionName(envvar.GetTestProjectFromEnv(), subscription)).Do()
 		if err != nil {
 			return err
 		}
diff --git a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_topic_test.go b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_topic_test.go
@@ -140,7 +140,7 @@ func TestAccPubsubTopicIamPolicy(t *testing.T) {
 func testAccCheckPubsubTopicIam(t *testing.T, topic, role string, members []string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		config := acctest.GoogleProviderConfig(t)
-		p, err := config.NewPubsubClient(config.UserAgent).Projects.Topics.GetIamPolicy(pubsub.GetComputedTopicName(envvar.GetTestProjectFromEnv(), topic)).Do()
+		p, err := pubsub.NewClient(config, config.UserAgent).Projects.Topics.GetIamPolicy(pubsub.GetComputedTopicName(envvar.GetTestProjectFromEnv(), topic)).Do()
 		if err != nil {
 			return err
 		}
diff --git a/mmv1/third_party/terraform/services/runtimeconfig/client.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/client.go.tmpl
@@ -0,0 +1,25 @@
+package runtimeconfig
+
+{{ if ne $.TargetVersionName `ga` -}}
+import (
+	"log"
+
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+	"google.golang.org/api/option"
+	runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1"
+)
+
+func NewClient(c *transport_tpg.Config, userAgent string) *runtimeconfig.Service {
+	runtimeConfigClientBasePath := transport_tpg.RemoveBasePathVersion(c.RuntimeConfigBasePath)
+	log.Printf("[INFO] Instantiating Google Cloud Runtimeconfig client for path %s", runtimeConfigClientBasePath)
+	clientRuntimeconfig, err := runtimeconfig.NewService(c.Context, option.WithHTTPClient(c.Client))
+	if err != nil {
+		log.Printf("[WARN] Error creating client runtime config: %s", err)
+		return nil
+	}
+	clientRuntimeconfig.UserAgent = userAgent
+	clientRuntimeconfig.BasePath = runtimeConfigClientBasePath
+
+	return clientRuntimeconfig
+}
+{{- end }}
diff --git a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config.go.tmpl
@@ -81,7 +81,7 @@ func resourceRuntimeconfigConfigCreate(d *schema.ResourceData, meta interface{})
 		runtimeConfig.Description = val.(string)
 	}
 
-	_, err = config.NewRuntimeconfigClient(userAgent).Projects.Configs.Create("projects/"+project, &runtimeConfig).Do()
+	_, err = NewClient(config, userAgent).Projects.Configs.Create("projects/"+project, &runtimeConfig).Do()
 
 	if err != nil {
 		return err
@@ -99,7 +99,7 @@ func resourceRuntimeconfigConfigRead(d *schema.ResourceData, meta interface{}) e
 	}
 
 	fullName := d.Id()
-	runConfig, err := config.NewRuntimeconfigClient(userAgent).Projects.Configs.Get(fullName).Do()
+	runConfig, err := NewClient(config, userAgent).Projects.Configs.Get(fullName).Do()
 	if err != nil {
 		return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("RuntimeConfig %q", d.Id()))
 	}
@@ -150,7 +150,7 @@ func resourceRuntimeconfigConfigUpdate(d *schema.ResourceData, meta interface{})
 		runtimeConfig.Description = v.(string)
 	}
 
-	_, err = config.NewRuntimeconfigClient(userAgent).Projects.Configs.Update(fullName, &runtimeConfig).Do()
+	_, err = NewClient(config, userAgent).Projects.Configs.Update(fullName, &runtimeConfig).Do()
 	if err != nil {
 		return err
 	}
@@ -166,7 +166,7 @@ func resourceRuntimeconfigConfigDelete(d *schema.ResourceData, meta interface{})
 
 	fullName := d.Id()
 
-	_, err = config.NewRuntimeconfigClient(userAgent).Projects.Configs.Delete(fullName).Do()
+	_, err = NewClient(config, userAgent).Projects.Configs.Delete(fullName).Do()
 	if err != nil {
 		return err
 	}
diff --git a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config_test.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config_test.go.tmpl
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	runtimeconfig_tpg "github.com/hashicorp/terraform-provider-google/google/services/runtimeconfig"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -128,7 +129,7 @@ func testAccCheckRuntimeConfigExists(t *testing.T, resourceName string, runtimeC
 
 		config := acctest.GoogleProviderConfig(t)
 
-		found, err := config.NewRuntimeconfigClient(config.UserAgent).Projects.Configs.Get(rs.Primary.ID).Do()
+		found, err := runtimeconfig_tpg.NewClient(config, config.UserAgent).Projects.Configs.Get(rs.Primary.ID).Do()
 		if err != nil {
 			return err
 		}
@@ -148,7 +149,7 @@ func testAccCheckRuntimeconfigConfigDestroyProducer(t *testing.T) func(s *terraf
 				continue
 			}
 
-			_, err := config.NewRuntimeconfigClient(config.UserAgent).Projects.Configs.Get(rs.Primary.ID).Do()
+			_, err := runtimeconfig_tpg.NewClient(config, config.UserAgent).Projects.Configs.Get(rs.Primary.ID).Do()
 
 			if err == nil {
 				return fmt.Errorf("Runtimeconfig still exists")
diff --git a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable.go.tmpl
@@ -93,7 +93,7 @@ func resourceRuntimeconfigVariableCreate(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	createdVariable, err := config.NewRuntimeconfigClient(userAgent).Projects.Configs.Variables.Create(resourceRuntimeconfigFullName(project, parent), variable).Do()
+	createdVariable, err := NewClient(config, userAgent).Projects.Configs.Variables.Create(resourceRuntimeconfigFullName(project, parent), variable).Do()
 	if err != nil {
 		return err
 	}
@@ -110,7 +110,7 @@ func resourceRuntimeconfigVariableRead(d *schema.ResourceData, meta interface{})
 	}
 
 	fullName := d.Id()
-	createdVariable, err := config.NewRuntimeconfigClient(userAgent).Projects.Configs.Variables.Get(fullName).Do()
+	createdVariable, err := NewClient(config, userAgent).Projects.Configs.Variables.Get(fullName).Do()
 	if err != nil {
 		return err
 	}
@@ -138,7 +138,7 @@ func resourceRuntimeconfigVariableUpdate(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	createdVariable, err := config.NewRuntimeconfigClient(userAgent).Projects.Configs.Variables.Update(variable.Name, variable).Do()
+	createdVariable, err := NewClient(config, userAgent).Projects.Configs.Variables.Update(variable.Name, variable).Do()
 	if err != nil {
 		return err
 	}
@@ -155,7 +155,7 @@ func resourceRuntimeconfigVariableDelete(d *schema.ResourceData, meta interface{
 
 	fullName := d.Id()
 
-	_, err = config.NewRuntimeconfigClient(userAgent).Projects.Configs.Variables.Delete(fullName).Do()
+	_, err = NewClient(config, userAgent).Projects.Configs.Variables.Delete(fullName).Do()
 	if err != nil {
 		return err
 	}
diff --git a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable_test.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable_test.go.tmpl
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	runtimeconfig_tpg "github.com/hashicorp/terraform-provider-google/google/services/runtimeconfig"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -123,7 +124,7 @@ func testAccCheckRuntimeconfigVariableExists(t *testing.T, resourceName string,
 
 		config := acctest.GoogleProviderConfig(t)
 
-		found, err := config.NewRuntimeconfigClient(config.UserAgent).Projects.Configs.Variables.Get(rs.Primary.ID).Do()
+		found, err := runtimeconfig_tpg.NewClient(config, config.UserAgent).Projects.Configs.Variables.Get(rs.Primary.ID).Do()
 		if err != nil {
 			return err
 		}
@@ -187,7 +188,7 @@ func testAccCheckRuntimeconfigVariableDestroyProducer(t *testing.T) func(s *terr
 				continue
 			}
 
-			_, err := config.NewRuntimeconfigClient(config.UserAgent).Projects.Configs.Variables.Get(rs.Primary.ID).Do()
+			_, err := runtimeconfig_tpg.NewClient(config, config.UserAgent).Projects.Configs.Variables.Get(rs.Primary.ID).Do()
 
 			if err == nil {
 				return fmt.Errorf("Runtimeconfig variable still exists")
diff --git a/mmv1/third_party/terraform/services/servicemanagement/client.go b/mmv1/third_party/terraform/services/servicemanagement/client.go
@@ -0,0 +1,23 @@
+package servicemanagement
+
+import (
+	"log"
+
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+	"google.golang.org/api/option"
+	"google.golang.org/api/servicemanagement/v1"
+)
+
+func NewClient(c *transport_tpg.Config, userAgent string) *servicemanagement.APIService {
+	serviceManagementClientBasePath := transport_tpg.RemoveBasePathVersion(c.ServiceManagementBasePath)
+	log.Printf("[INFO] Instantiating Google Cloud Service Management client for path %s", serviceManagementClientBasePath)
+	clientServiceMan, err := servicemanagement.NewService(c.Context, option.WithHTTPClient(c.Client))
+	if err != nil {
+		log.Printf("[WARN] Error creating client service management: %s", err)
+		return nil
+	}
+	clientServiceMan.UserAgent = userAgent
+	clientServiceMan.BasePath = serviceManagementClientBasePath
+
+	return clientServiceMan
+}
diff --git a/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service.go b/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service.go
diff --git a/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service_test.go b/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service_test.go
diff --git a/mmv1/third_party/terraform/services/servicemanagement/serviceman_operation.go b/mmv1/third_party/terraform/services/servicemanagement/serviceman_operation.go
diff --git a/mmv1/third_party/terraform/transport/config.go.tmpl b/mmv1/third_party/terraform/transport/config.go.tmpl

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func dataSourceGoogleCertificateManagerCertificatesRead(d *schema.ResourceData,`
`57`	`57`	`filter := d.Get("filter").(string)`
`58`	`58`
`59`	`59`	`certificates := make([]map[string]interface{}, 0)`
`60`		`- certificatesList, err := config.NewCertificateManagerClient(userAgent).Projects.Locations.Certificates.List(fmt.Sprintf("projects/%s/locations/%s", project, region)).Filter(filter).Do()`
	`60`	`+ certificatesList, err := NewClient(config, userAgent).Projects.Locations.Certificates.List(fmt.Sprintf("projects/%s/locations/%s", project, region)).Filter(filter).Do()`
`61`	`61`	`if err != nil {`
`62`	`62`	`return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Certificates : %s %s", project, region))`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func (d *GoogleFirebaseAdminSdkConfigDataSource) Configure(ctx context.Context,`
`93`	`93`	`return`
`94`	`94`	`}`
`95`	`95`
`96`		`- p, ok := req.ProviderData.(*transport_tpg.Config)`
	`96`	`+ config, ok := req.ProviderData.(*transport_tpg.Config)`
`97`	`97`	`if !ok {`
`98`	`98`	`resp.Diagnostics.AddError(`
`99`	`99`	`"Unexpected Data Source Configure Type",`
`@@ -102,11 +102,11 @@ func (d *GoogleFirebaseAdminSdkConfigDataSource) Configure(ctx context.Context,`
`102`	`102`	`return`
`103`	`103`	`}`
`104`	`104`
`105`		`- d.client = p.NewFirebaseClient(ctx, p.UserAgent)`
	`105`	`+ d.client = NewClient(ctx, config, config.UserAgent)`
`106`	`106`	`if resp.Diagnostics.HasError() {`
`107`	`107`	`return`
`108`	`108`	`}`
`109`		`- d.providerConfig = p`
	`109`	`+ d.providerConfig = config`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`func (d GoogleFirebaseAdminSdkConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp datasource.ReadResponse) {`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (d *GoogleFirebaseAndroidAppConfigDataSource) Configure(ctx context.Context`
`92`	`92`	`return`
`93`	`93`	`}`
`94`	`94`
`95`		`- p, ok := req.ProviderData.(*transport_tpg.Config)`
	`95`	`+ config, ok := req.ProviderData.(*transport_tpg.Config)`
`96`	`96`	`if !ok {`
`97`	`97`	`resp.Diagnostics.AddError(`
`98`	`98`	`"Unexpected Data Source Configure Type",`
`@@ -101,11 +101,11 @@ func (d *GoogleFirebaseAndroidAppConfigDataSource) Configure(ctx context.Context`
`101`	`101`	`return`
`102`	`102`	`}`
`103`	`103`
`104`		`- d.client = p.NewFirebaseClient(ctx, p.UserAgent)`
	`104`	`+ d.client = NewClient(ctx, config, config.UserAgent)`
`105`	`105`	`if resp.Diagnostics.HasError() {`
`106`	`106`	`return`
`107`	`107`	`}`
`108`		`- d.providerConfig = p`
	`108`	`+ d.providerConfig = config`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`func (d GoogleFirebaseAndroidAppConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp datasource.ReadResponse) {`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (d *GoogleFirebaseWebAppConfigDataSource) Configure(ctx context.Context, re`
`139`	`139`	`return`
`140`	`140`	`}`
`141`	`141`
`142`		`- p, ok := req.ProviderData.(*transport_tpg.Config)`
	`142`	`+ config, ok := req.ProviderData.(*transport_tpg.Config)`
`143`	`143`	`if !ok {`
`144`	`144`	`resp.Diagnostics.AddError(`
`145`	`145`	`"Unexpected Data Source Configure Type",`
`@@ -148,11 +148,11 @@ func (d *GoogleFirebaseWebAppConfigDataSource) Configure(ctx context.Context, re`
`148`	`148`	`return`
`149`	`149`	`}`
`150`	`150`
`151`		`- d.client = p.NewFirebaseClient(ctx, p.UserAgent)`
	`151`	`+ d.client = NewClient(ctx, config, config.UserAgent)`
`152`	`152`	`if resp.Diagnostics.HasError() {`
`153`	`153`	`return`
`154`	`154`	`}`
`155`		`- d.providerConfig = p`
	`155`	`+ d.providerConfig = config`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`func (d GoogleFirebaseWebAppConfigDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp datasource.ReadResponse) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (u PubsubSubscriptionIamUpdater) GetResourceIamPolicy() (cloudresourceman`
`64`	`64`	`return nil, err`
`65`	`65`	`}`
`66`	`66`
`67`		`- p, err := u.Config.NewPubsubClient(userAgent).Projects.Subscriptions.GetIamPolicy(u.subscription).Do()`
	`67`	`+ p, err := NewClient(u.Config, userAgent).Projects.Subscriptions.GetIamPolicy(u.subscription).Do()`
`68`	`68`
`69`	`69`	`if err != nil {`
`70`	`70`	`return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{"{{"}}err{{"}}"}}", u.DescribeResource()), err)`
`@@ -89,7 +89,7 @@ func (u PubsubSubscriptionIamUpdater) SetResourceIamPolicy(policy cloudresourc`
`89`	`89`	`return err`
`90`	`90`	`}`
`91`	`91`
`92`		`- _, err = u.Config.NewPubsubClient(userAgent).Projects.Subscriptions.SetIamPolicy(u.subscription, &pubsub.SetIamPolicyRequest{`
	`92`	`+ _, err = NewClient(u.Config, userAgent).Projects.Subscriptions.SetIamPolicy(u.subscription, &pubsub.SetIamPolicyRequest{`
`93`	`93`	`Policy: pubsubPolicy,`
`94`	`94`	`}).Do()`
`95`	`95`