Changes suggested from PR review and removed dependencies to be added…

… in a separate PR
hashicorp · Jun 28, 2019 · f954028 · f954028
1 parent 0e4d09e
commit f954028
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10,068 deletions.
diff --git a/google/config.go b/google/config.go
@@ -173,9 +173,14 @@ type Config struct {
 	StorageTransferBasePath string
 	clientStorageTransfer   *storagetransfer.Service
 
-	bigtableClientFactory   *BigtableClientFactory
-	BigtableAdminBasePath   string
-	clientBigtableInstances *bigtableadmin.ProjectsInstancesService
+	bigtableClientFactory *BigtableClientFactory
+	BigtableAdminBasePath string
+	// Unlike other clients, the Bigtable Admin client doesn't use a single
+	// service. Instead, there are several distinct services created off
+	// the base service object. To imitate most other handwritten clients,
+	// we expose those directly instead of providing the `Service` object
+	// as a factory.
+	clientBigtableProjectsInstances *bigtableadmin.ProjectsInstancesService
 }
 
 var defaultClientScopes = []string{
@@ -431,14 +436,15 @@ func (c *Config) LoadAndValidate() error {
 	}
 
 	bigtableAdminBasePath := removeBasePathVersion(c.BigtableAdminBasePath)
+	log.Printf("[INFO] Instantiating Google Cloud BigtableAdmin for path %s", bigtableAdminBasePath)
 
 	clientBigtable, err := bigtableadmin.NewService(context, option.WithHTTPClient(client))
 	if err != nil {
 		return err
 	}
 	clientBigtable.UserAgent = userAgent
 	clientBigtable.BasePath = bigtableAdminBasePath
-	c.clientBigtableInstances = bigtableadmin.NewProjectsInstancesService(clientBigtable)
+	c.clientBigtableProjectsInstances = bigtableadmin.NewProjectsInstancesService(clientBigtable)
 
 	sourceRepoClientBasePath := removeBasePathVersion(c.SourceRepoBasePath)
 	log.Printf("[INFO] Instantiating Google Cloud Source Repo client for path %s", sourceRepoClientBasePath)

diff --git a/google/iam_bigtable_instance.go b/google/iam_bigtable_instance.go
@@ -60,7 +60,7 @@ func BigtableInstanceIdParseFunc(d *schema.ResourceData, config *Config) error {
 
 func (u *BigtableInstanceIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
 	req := &bigtableadmin.GetIamPolicyRequest{}
-	p, err := u.Config.clientBigtableInstances.GetIamPolicy(u.GetResourceId(), req).Do()
+	p, err := u.Config.clientBigtableProjectsInstances.GetIamPolicy(u.GetResourceId(), req).Do()
 	if err != nil {
 		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
 	}
@@ -80,7 +80,7 @@ func (u *BigtableInstanceIamUpdater) SetResourceIamPolicy(policy *cloudresourcem
 	}
 
 	req := &bigtableadmin.SetIamPolicyRequest{Policy: bigtablePolicy}
-	_, err = u.Config.clientBigtableInstances.SetIamPolicy(u.GetResourceId(), req).Do()
+	_, err = u.Config.clientBigtableProjectsInstances.SetIamPolicy(u.GetResourceId(), req).Do()
 	if err != nil {
 		return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
 	}
@@ -104,7 +104,7 @@ func resourceManagerToBigtablePolicy(p *cloudresourcemanager.Policy) (*bigtablea
 	out := &bigtableadmin.Policy{}
 	err := Convert(p, out)
 	if err != nil {
-		return nil, errwrap.Wrapf("Cannot convert a dataproc policy to a cloudresourcemanager policy: {{err}}", err)
+		return nil, errwrap.Wrapf("Cannot convert a bigtable policy to a cloudresourcemanager policy: {{err}}", err)
 	}
 	return out, nil
 }
@@ -113,7 +113,7 @@ func bigtableToResourceManagerPolicy(p *bigtableadmin.Policy) (*cloudresourceman
 	out := &cloudresourcemanager.Policy{}
 	err := Convert(p, out)
 	if err != nil {
-		return nil, errwrap.Wrapf("Cannot convert a cloudresourcemanager policy to a dataproc policy: {{err}}", err)
+		return nil, errwrap.Wrapf("Cannot convert a cloudresourcemanager policy to a bigtable policy: {{err}}", err)
 	}
 	return out, nil
 }
diff --git a/google/provider_handwritten_endpoint.go b/google/provider_handwritten_endpoint.go
@@ -228,13 +228,13 @@ var StorageTransferCustomEndpointEntry = &schema.Schema{
 }
 
 var BigtableAdminDefaultBasePath = "https://bigtableadmin.googleapis.com/v2/"
-var BigtableAdminCustomEndpointEntryKey = "bigtableadmin_custom_endpoint"
+var BigtableAdminCustomEndpointEntryKey = "bigtable_custom_endpoint"
 var BigtableAdminCustomEndpointEntry = &schema.Schema{
 	Type:         schema.TypeString,
 	Optional:     true,
 	ValidateFunc: validateCustomEndpoint,
 	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
-		"GOOGLE_BIGTABLE_ADMIN_CUSTOM_ENDPOINT",
+		"GOOGLE_BIGTABLE_CUSTOM_ENDPOINT",
 	}, BigtableAdminDefaultBasePath),
 }