Refactoring clients continues (18 more services) (#4031) (#2529)

* create new service for compute beta calls

* update client container to create new client each call

* update client container beta to create new client each call

* update client dns to create new client each call

* update dns client

* update containerOperationWait calls to pass userAgent

* update client dns beta to create new client each call

* update client kms to create new client each call

* remove clientKms from config

* update client logging to create new client each call

* update client storage to create new client each call

* update client sqladmin to create new client each call

* update client pubsub to create new client each call

* update client dataflow to create new client each call

* update client resource manager to create new client each call

* update client resource manager v2beta1 to create new client each call

* fix lint errors (remove clientContainer, clientContainerBeta and clientDns from config)

* update client runtime config to create new client each call

* update client iam to create new client each call

* update client iam credentials to create new client each call

* update client service management to create new client each call

* update client service usage to create new client each call

* fix wrappedPubsubClient for vcr tests

* attempt fix wrappedPubsubClient for vcr tests

* attempt fix for pubsub in vcr tests

* another pubsub fix

* attempt fix wrappedPubsubClient for vcr tests

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/4031.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/bootstrap_utils_test.go

@@ -70,7 +70,7 @@ func BootstrapKMSKeyWithPurposeInLocationAndName(t *testing.T, purpose, location
 	keyName := fmt.Sprintf("%s/cryptoKeys/%s", keyParent, keyShortName)
 
 	// Get or Create the hard coded shared keyring for testing
-	kmsClient := config.clientKms
+	kmsClient := config.NewKmsClient(config.userAgent)
 	keyRing, err := kmsClient.Projects.Locations.KeyRings.Get(keyRingName).Do()
 	if err != nil {
 		if isGoogleApiErrorWithCode(err, 404) {
@@ -137,7 +137,7 @@ func getOrCreateServiceAccount(config *Config, project string) (*iam.ServiceAcco
 	name := fmt.Sprintf("projects/%s/serviceAccounts/%s@%s.iam.gserviceaccount.com", project, serviceAccountEmail, project)
 	log.Printf("[DEBUG] Verifying %s as bootstrapped service account.\n", name)
 
-	sa, err := config.clientIAM.Projects.ServiceAccounts.Get(name).Do()
+	sa, err := config.NewIamClient(config.userAgent).Projects.ServiceAccounts.Get(name).Do()
 	if err != nil && !isGoogleApiErrorWithCode(err, 404) {
 		return nil, err
 	}
@@ -152,7 +152,7 @@ func getOrCreateServiceAccount(config *Config, project string) (*iam.ServiceAcco
 			AccountId:      serviceAccountEmail,
 			ServiceAccount: sa,
 		}
-		sa, err = config.clientIAM.Projects.ServiceAccounts.Create("projects/"+project, r).Do()
+		sa, err = config.NewIamClient(config.userAgent).Projects.ServiceAccounts.Create("projects/"+project, r).Do()
 		if err != nil {
 			return nil, err
 		}
@@ -180,7 +180,7 @@ func impersonationServiceAccountPermissions(config *Config, sa *iam.ServiceAccou
 	// Overwrite the roles each time on this service account. This is because this account is
 	// only created for the test suite and will stop snowflaking of permissions to get tests
 	// to run. Overwriting permissions on 1 service account shouldn't affect others.
-	_, err := config.clientIAM.Projects.ServiceAccounts.SetIamPolicy(sa.Name, &iam.SetIamPolicyRequest{
+	_, err := config.NewIamClient(config.userAgent).Projects.ServiceAccounts.SetIamPolicy(sa.Name, &iam.SetIamPolicyRequest{
 		Policy: &policy,
 	}).Do()
 	if err != nil {
@@ -274,7 +274,7 @@ func BootstrapServicePerimeterProjects(t *testing.T, desiredProjects int) []*clo
 	// doesn't seem to allow for prefix matching. Don't change this to include the parent type unless
 	// that API behavior changes.
 	prefixFilter := fmt.Sprintf("id:%s* parent.id:%s", SharedServicePerimeterProjectPrefix, org)
-	res, err := config.clientResourceManager.Projects.List().Filter(prefixFilter).Do()
+	res, err := config.NewResourceManagerClient(config.userAgent).Projects.List().Filter(prefixFilter).Do()
 	if err != nil {
 		t.Fatalf("Error getting shared test projects: %s", err)
 	}
@@ -290,7 +290,7 @@ func BootstrapServicePerimeterProjects(t *testing.T, desiredProjects int) []*clo
 				Id:   org,
 			},
 		}
-		op, err := config.clientResourceManager.Projects.Create(project).Do()
+		op, err := config.NewResourceManagerClient(config.userAgent).Projects.Create(project).Do()
 		if err != nil {
 			t.Fatalf("Error bootstrapping shared test project: %s", err)
 		}
@@ -305,7 +305,7 @@ func BootstrapServicePerimeterProjects(t *testing.T, desiredProjects int) []*clo
 			t.Fatalf("Error bootstrapping shared test project: %s", err)
 		}
 
-		p, err := config.clientResourceManager.Projects.Get(pid).Do()
+		p, err := config.NewResourceManagerClient(config.userAgent).Projects.Get(pid).Do()
 		if err != nil {
 			t.Fatalf("Error getting shared test project: %s", err)
 		}

google-beta/compute_operation.go

@@ -104,7 +104,7 @@ func computeOperationWaitTime(config *Config, res interface{}, project, activity
 	}
 
 	w := &ComputeOperationWaiter{
-		Service: config.clientComputeBeta,
+		Service: config.NewComputeBetaClient(userAgent),
 		Context: config.context,
 		Op:      op,
 		Project: project,
@@ -116,15 +116,15 @@ func computeOperationWaitTime(config *Config, res interface{}, project, activity
 	return OperationWait(w, activity, timeout, config.PollInterval)
 }
 
-func computeOrgOperationWaitTimeWithResponse(config *Config, res interface{}, response *map[string]interface{}, parent, activity string, timeout time.Duration) error {
+func computeOrgOperationWaitTimeWithResponse(config *Config, res interface{}, response *map[string]interface{}, parent, activity, userAgent string, timeout time.Duration) error {
 	op := &computeBeta.Operation{}
 	err := Convert(res, op)
 	if err != nil {
 		return err
 	}
 
 	w := &ComputeOperationWaiter{
-		Service: config.clientComputeBeta,
+		Service: config.NewComputeBetaClient(userAgent),
 		Op:      op,
 		Parent:  parent,
 	}