ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update with go fmt

This commit is contained in:
clint shryock 2015-10-29 17:10:44 -05:00
parent d2e4b662d3
commit ec2d22cf29
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/providers/google/config.go
View File

@ -42,7 +42,6 @@ func (c *Config) loadAndValidate() error {
"https://www.googleapis.com/auth/devstorage.full_control", "https://www.googleapis.com/auth/devstorage.full_control",
} }
if c.AccountFile == "" { if c.AccountFile == "" {
c.AccountFile = os.Getenv("GOOGLE_ACCOUNT_FILE") c.AccountFile = os.Getenv("GOOGLE_ACCOUNT_FILE")
} }
@ -104,7 +103,7 @@ func (c *Config) loadAndValidate() error {
client = conf.Client(oauth2.NoContext) client = conf.Client(oauth2.NoContext)
} else { } else {
log.Printf("[INFO] Authenticating using DefaultClient"); log.Printf("[INFO] Authenticating using DefaultClient")
err := error(nil) err := error(nil)
client, err = google.DefaultClient(oauth2.NoContext, clientScopes...) client, err = google.DefaultClient(oauth2.NoContext, clientScopes...)
if err != nil { if err != nil {

2
builtin/providers/google/resource_compute_instance.go
View File

@ -788,7 +788,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
return opErr return opErr
} }
d.SetPartial("scheduling"); d.SetPartial("scheduling")
} }
networkInterfacesCount := d.Get("network_interface.#").(int) networkInterfacesCount := d.Get("network_interface.#").(int)

4
builtin/providers/google/resource_compute_instance_group_manager.go
View File

@ -255,14 +255,14 @@ func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta inte
for err != nil && currentSize > 0 { for err != nil && currentSize > 0 {
if !strings.Contains(err.Error(), "timeout") { if !strings.Contains(err.Error(), "timeout") {
return err; return err
} }
instanceGroup, err := config.clientCompute.InstanceGroups.Get( instanceGroup, err := config.clientCompute.InstanceGroups.Get(
config.Project, d.Get("zone").(string), d.Id()).Do() config.Project, d.Get("zone").(string), d.Id()).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error getting instance group size: %s", err); return fmt.Errorf("Error getting instance group size: %s", err)
} }
if instanceGroup.Size >= currentSize { if instanceGroup.Size >= currentSize {