mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
Renamed ClientFactoryBigtable to BigtableClientFactory
This commit is contained in:
parent
2c2615317b
commit
048bfe5857
@ -8,15 +8,15 @@ import (
|
||||
"google.golang.org/api/option"
|
||||
)
|
||||
|
||||
type ClientFactoryBigtable struct {
|
||||
type BigtableClientFactory struct {
|
||||
UserAgent string
|
||||
TokenSource oauth2.TokenSource
|
||||
}
|
||||
|
||||
func (s *ClientFactoryBigtable) NewInstanceAdminClient(project string) (*bigtable.InstanceAdminClient, error) {
|
||||
func (s *BigtableClientFactory) NewInstanceAdminClient(project string) (*bigtable.InstanceAdminClient, error) {
|
||||
return bigtable.NewInstanceAdminClient(context.Background(), project, option.WithTokenSource(s.TokenSource), option.WithUserAgent(s.UserAgent))
|
||||
}
|
||||
|
||||
func (s *ClientFactoryBigtable) NewAdminClient(project, instance string) (*bigtable.AdminClient, error) {
|
||||
func (s *BigtableClientFactory) NewAdminClient(project, instance string) (*bigtable.AdminClient, error) {
|
||||
return bigtable.NewAdminClient(context.Background(), project, instance, option.WithTokenSource(s.TokenSource), option.WithUserAgent(s.UserAgent))
|
||||
}
|
@ -48,7 +48,7 @@ type Config struct {
|
||||
clientServiceMan *servicemanagement.APIService
|
||||
clientBigQuery *bigquery.Service
|
||||
|
||||
clientFactoryBigtable *ClientFactoryBigtable
|
||||
bigtableClientFactory *BigtableClientFactory
|
||||
}
|
||||
|
||||
func (c *Config) loadAndValidate() error {
|
||||
@ -193,7 +193,7 @@ func (c *Config) loadAndValidate() error {
|
||||
c.clientBigQuery.UserAgent = userAgent
|
||||
|
||||
log.Printf("[INFO] Instantiating Google Cloud Bigtable Client Factory...")
|
||||
c.clientFactoryBigtable = &ClientFactoryBigtable{
|
||||
c.bigtableClientFactory = &BigtableClientFactory{
|
||||
UserAgent: userAgent,
|
||||
TokenSource: tokenSource,
|
||||
}
|
||||
|
@ -99,7 +99,7 @@ func resourceBigtableInstanceCreate(d *schema.ResourceData, meta interface{}) er
|
||||
Zone: d.Get("zone").(string),
|
||||
}
|
||||
|
||||
c, err := config.clientFactoryBigtable.NewInstanceAdminClient(project)
|
||||
c, err := config.bigtableClientFactory.NewInstanceAdminClient(project)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error starting instance admin client. %s", err)
|
||||
}
|
||||
@ -125,7 +125,7 @@ func resourceBigtableInstanceRead(d *schema.ResourceData, meta interface{}) erro
|
||||
return err
|
||||
}
|
||||
|
||||
c, err := config.clientFactoryBigtable.NewInstanceAdminClient(project)
|
||||
c, err := config.bigtableClientFactory.NewInstanceAdminClient(project)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error starting instance admin client. %s", err)
|
||||
}
|
||||
@ -166,7 +166,7 @@ func resourceBigtableInstanceDestroy(d *schema.ResourceData, meta interface{}) e
|
||||
return err
|
||||
}
|
||||
|
||||
c, err := config.clientFactoryBigtable.NewInstanceAdminClient(project)
|
||||
c, err := config.bigtableClientFactory.NewInstanceAdminClient(project)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error starting instance admin client. %s", err)
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ func testAccCheckBigtableInstanceDestroy(s *terraform.State) error {
|
||||
}
|
||||
|
||||
config := testAccProvider.Meta().(*Config)
|
||||
c, err := config.clientFactoryBigtable.NewInstanceAdminClient(config.Project)
|
||||
c, err := config.bigtableClientFactory.NewInstanceAdminClient(config.Project)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error starting instance admin client. %s", err)
|
||||
}
|
||||
@ -77,7 +77,7 @@ func testAccBigtableInstanceExists(n string) resource.TestCheckFunc {
|
||||
return fmt.Errorf("No ID is set")
|
||||
}
|
||||
config := testAccProvider.Meta().(*Config)
|
||||
c, err := config.clientFactoryBigtable.NewInstanceAdminClient(config.Project)
|
||||
c, err := config.bigtableClientFactory.NewInstanceAdminClient(config.Project)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error starting instance admin client. %s", err)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user