Skip to content

Commit 523639b

Browse files
committed
fmt
1 parent 4a11b1c commit 523639b

11 files changed

Lines changed: 34 additions & 46 deletions

builtin/providers/aws/network_acl_entry.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package aws
22

33
import (
4-
"github.com/mitchellh/goamz/ec2"
54
"fmt"
5+
"github.com/mitchellh/goamz/ec2"
66
)
77

88
func expandNetworkAclEntries(configured []interface{}, entryType string) ([]ec2.NetworkAclEntry, error) {
@@ -11,7 +11,7 @@ func expandNetworkAclEntries(configured []interface{}, entryType string) ([]ec2.
1111
data := eRaw.(map[string]interface{})
1212
protocol := data["protocol"].(string)
1313
_, ok := protocolIntegers()[protocol]
14-
if(!ok){
14+
if !ok {
1515
return nil, fmt.Errorf("Invalid Protocol %s for rule %#v", protocol, data)
1616
}
1717
p := extractProtocolInteger(data["protocol"].(string))
@@ -69,7 +69,7 @@ func protocolIntegers() map[string]int {
6969
"udp": 17,
7070
"tcp": 6,
7171
"icmp": 1,
72-
"all": -1,
72+
"all": -1,
7373
}
7474
return protocolIntegers
7575
}

builtin/providers/aws/resource_aws_vpc_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,3 @@ resource "aws_vpc" "bar" {
216216
cidr_block = "10.2.0.0/16"
217217
}
218218
`
219-

builtin/providers/aws/structure_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ func Test_flattenParameters(t *testing.T) {
297297
},
298298
Output: []map[string]interface{}{
299299
map[string]interface{}{
300-
"name": "character_set_client",
301-
"value": "utf8",
300+
"name": "character_set_client",
301+
"value": "utf8",
302302
},
303303
},
304304
},

builtin/providers/google/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"golang.org/x/oauth2/jwt"
1515
)
1616

17-
1817
// Config is the configuration structure used to instantiate the Google
1918
// provider.
2019
type Config struct {

builtin/providers/google/image.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
// If it is of the form name then look in the configured project and then hosted image projects.
1111
func resolveImage(c *Config, name string) (string, error) {
1212

13-
1413
if strings.HasPrefix(name, "https://www.googleapis.com/compute/v1/") {
1514
return name, nil
1615

builtin/providers/google/resource_compute_address.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ func resourceComputeAddress() *schema.Resource {
3232
Type: schema.TypeString,
3333
Computed: true,
3434
},
35-
3635
},
3736
}
3837
}

builtin/providers/google/resource_compute_forwarding_rule.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
6868
config := meta.(*Config)
6969

7070
frule := &compute.ForwardingRule{
71-
IPAddress: d.Get("ip_address").(string),
72-
IPProtocol: d.Get("ip_protocol").(string),
71+
IPAddress: d.Get("ip_address").(string),
72+
IPProtocol: d.Get("ip_protocol").(string),
7373
Description: d.Get("description").(string),
74-
Name: d.Get("name").(string),
75-
PortRange: d.Get("port_range").(string),
76-
Target: d.Get("target").(string),
74+
Name: d.Get("name").(string),
75+
PortRange: d.Get("port_range").(string),
76+
Target: d.Get("target").(string),
7777
}
7878

7979
log.Printf("[DEBUG] ForwardingRule insert request: %#v", frule)
@@ -216,4 +216,3 @@ func resourceComputeForwardingRuleDelete(d *schema.ResourceData, meta interface{
216216
d.SetId("")
217217
return nil
218218
}
219-

builtin/providers/google/resource_compute_forwarding_rule_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,3 @@ resource "google_compute_forwarding_rule" "foobar" {
122122
target = "${google_compute_target_pool.foobar-tp.self_link}"
123123
}
124124
`
125-

builtin/providers/google/resource_compute_instance.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func resourceComputeInstance() *schema.Resource {
106106
Elem: &schema.Resource{
107107
Schema: map[string]*schema.Schema{
108108
"nat_ip": &schema.Schema{
109-
Type: schema.TypeString,
109+
Type: schema.TypeString,
110110
Computed: true,
111111
Optional: true,
112112
},
@@ -248,7 +248,6 @@ func resourceOperationWaitZone(
248248
return nil
249249
}
250250

251-
252251
func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) error {
253252
config := meta.(*Config)
254253

@@ -308,7 +307,6 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
308307
if v, ok := d.GetOk(prefix + ".image"); ok {
309308
imageName := v.(string)
310309

311-
312310
imageUrl, err := resolveImage(config, imageName)
313311
if err != nil {
314312
return fmt.Errorf(
@@ -557,7 +555,6 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
557555
internalIP = iface.NetworkIP
558556
}
559557

560-
561558
}
562559
}
563560

@@ -654,7 +651,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
654651
for i := 0; i < networkInterfacesCount; i++ {
655652
prefix := fmt.Sprintf("network_interface.%d", i)
656653
instNetworkInterface := instance.NetworkInterfaces[i]
657-
networkName := d.Get(prefix+".name").(string)
654+
networkName := d.Get(prefix + ".name").(string)
658655

659656
// TODO: This sanity check is broken by #929, disabled for now (by forcing the equality)
660657
networkName = instNetworkInterface.Name
@@ -663,7 +660,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
663660
return fmt.Errorf("Instance networkInterface had unexpected name: %s", instNetworkInterface.Name)
664661
}
665662

666-
if d.HasChange(prefix+".access_config") {
663+
if d.HasChange(prefix + ".access_config") {
667664

668665
// TODO: This code deletes then recreates accessConfigs. This is bad because it may
669666
// leave the machine inaccessible from either ip if the creation part fails (network
@@ -672,9 +669,9 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
672669
// necessary, and also add before removing.
673670

674671
// Delete any accessConfig that currently exists in instNetworkInterface
675-
for _, ac := range(instNetworkInterface.AccessConfigs) {
672+
for _, ac := range instNetworkInterface.AccessConfigs {
676673
op, err := config.clientCompute.Instances.DeleteAccessConfig(
677-
config.Project, zone, d.Id(), networkName, ac.Name).Do();
674+
config.Project, zone, d.Id(), networkName, ac.Name).Do()
678675
if err != nil {
679676
return fmt.Errorf("Error deleting old access_config: %s", err)
680677
}
@@ -693,7 +690,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
693690
NatIP: d.Get(acPrefix + ".nat_ip").(string),
694691
}
695692
op, err := config.clientCompute.Instances.AddAccessConfig(
696-
config.Project, zone, d.Id(), networkName, ac).Do();
693+
config.Project, zone, d.Id(), networkName, ac).Do()
697694
if err != nil {
698695
return fmt.Errorf("Error adding new access_config: %s", err)
699696
}

builtin/providers/google/resource_compute_target_pool.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ func resourceComputeTargetPool() *schema.Resource {
7272
}
7373

7474
func convertStringArr(ifaceArr []interface{}) []string {
75-
arr := make([]string, len(ifaceArr))
76-
for i, v := range ifaceArr {
77-
arr[i] = v.(string)
78-
}
79-
return arr
75+
arr := make([]string, len(ifaceArr))
76+
for i, v := range ifaceArr {
77+
arr[i] = v.(string)
78+
}
79+
return arr
8080
}
8181

8282
func waitOp(config *Config, op *compute.Operation,
@@ -151,11 +151,11 @@ func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) e
151151

152152
// Build the parameter
153153
tpool := &compute.TargetPool{
154-
BackupPool: d.Get("backup_pool").(string),
155-
Description: d.Get("description").(string),
156-
HealthChecks: hchkUrls,
157-
Instances: instanceUrls,
158-
Name: d.Get("name").(string),
154+
BackupPool: d.Get("backup_pool").(string),
155+
Description: d.Get("description").(string),
156+
HealthChecks: hchkUrls,
157+
Instances: instanceUrls,
158+
Name: d.Get("name").(string),
159159
SessionAffinity: d.Get("session_affinity").(string),
160160
}
161161
if d.Get("failover_ratio") != nil {
@@ -215,7 +215,6 @@ func calcAddRemove(from []string, to []string) ([]string, []string) {
215215
return add, remove
216216
}
217217

218-
219218
func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) error {
220219
config := meta.(*Config)
221220

0 commit comments

Comments
 (0)