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

Merge pull request #688 from ceh/yavf 

yet another vet fix round
This commit is contained in:
Sander van Harmelen 2014-12-17 13:10:05 +01:00
parent 1429ac6a7f fc36b1cd94
commit 54e558af82
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/atlas/resource_artifact.go
View File

@ -138,7 +138,7 @@ func resourceArtifactRead(d *schema.ResourceData, meta interface{}) error {
} else if len(vs) > 1 {
return fmt.Errorf(
"Got %d results for '%s/%s', only one is allowed",
user, name, len(vs))
len(vs), user, name)
}
v := vs[0]

12
builtin/providers/aws/resource_aws_network_acl.go
View File

@ -188,7 +188,7 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error
newSubnet := n.(string)
association, err := findNetworkAclAssociation(newSubnet, ec2conn)
if err != nil {
return fmt.Errorf("Failed to update acl %s with subnet %s: ", d.Id(), newSubnet, err)
return fmt.Errorf("Failed to update acl %s with subnet %s: %s", d.Id(), newSubnet, err)
}
_, err = ec2conn.ReplaceNetworkAclAssociation(association.NetworkAclAssociationId, d.Id())
if err != nil {
@ -221,7 +221,7 @@ func updateNetworkAclEntries(d *schema.ResourceData, entryType string, ec2conn *
ns := n.(*schema.Set)
toBeDeleted, err := expandNetworkAclEntries(os.Difference(ns).List(), entryType)
if(err != nil){
if err != nil {
return err
}
for _, remove := range toBeDeleted {
@ -233,7 +233,7 @@ func updateNetworkAclEntries(d *schema.ResourceData, entryType string, ec2conn *
}
toBeCreated, err := expandNetworkAclEntries(ns.Difference(os).List(), entryType)
if(err != nil){
if err != nil {
return err
}
for _, add := range toBeCreated {
@ -261,11 +261,11 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error
// This means the subnet is attached to default acl of vpc.
association, err := findNetworkAclAssociation(d.Get("subnet_id").(string), ec2conn)
if err != nil {
return fmt.Errorf("Depedency voilation: Can not delete acl: %s", d.Id(), err)
return fmt.Errorf("Dependency violation: Cannot delete acl %s: %s", d.Id(), err)
}
defaultAcl, err := getDefaultNetworkAcl(d.Get("vpc_id").(string), ec2conn)
if err != nil {
return fmt.Errorf("Depedency voilation: Can not delete acl %s", d.Id(), err)
return fmt.Errorf("Dependency violation: Cannot delete acl %s: %s", d.Id(), err)
}
_, err = ec2conn.ReplaceNetworkAclAssociation(association.NetworkAclAssociationId, defaultAcl.NetworkAclId)
return resource.RetryError{err}
@ -283,7 +283,7 @@ func resourceAwsNetworkAclEntryHash(v interface{}) int {
var buf bytes.Buffer
m := v.(map[string]interface{})
buf.WriteString(fmt.Sprintf("%d-", m["from_port"].(int)))
buf.WriteString(fmt.Sprintf("%s-", m["to_port"].(int)))
buf.WriteString(fmt.Sprintf("%d-", m["to_port"].(int)))
buf.WriteString(fmt.Sprintf("%d-", m["rule_no"].(int)))
buf.WriteString(fmt.Sprintf("%s-", m["action"].(string)))
buf.WriteString(fmt.Sprintf("%s-", m["protocol"].(string)))

2
builtin/providers/aws/resource_aws_network_acl_test.go
View File

@ -274,7 +274,7 @@ func testAccCheckSubnetIsAssociatedWithAcl(acl string, sub string) resource.Test
}
r, _ := conn.NetworkAcls([]string{}, ec2.NewFilter())
fmt.Printf("\n\nall acls\n %s\n\n", r.NetworkAcls)
fmt.Printf("\n\nall acls\n %#v\n\n", r.NetworkAcls)
conn.NetworkAcls([]string{}, filter)
return fmt.Errorf("Network Acl %s is not associated with subnet %s", acl, sub)

2
builtin/providers/aws/resource_aws_subnet_test.go
View File

@ -18,7 +18,7 @@ func TestAccAWSSubnet(t *testing.T) {
}
if v.MapPublicIpOnLaunch != true {
return fmt.Errorf("bad MapPublicIpOnLaunch: %s", v.MapPublicIpOnLaunch)
return fmt.Errorf("bad MapPublicIpOnLaunch: %t", v.MapPublicIpOnLaunch)
}
return nil

4
builtin/providers/heroku/resource_heroku_app.go
View File

@ -189,13 +189,13 @@ func resourceHerokuOrgAppCreate(d *schema.ResourceData, meta interface{}) error
if v := d.Get("organization.0.personal"); v != nil {
vs := v.(bool)
log.Printf("[DEBUG] Organization Personal: %s", vs)
log.Printf("[DEBUG] Organization Personal: %t", vs)
opts.Personal = &vs
}
if v := d.Get("organization.0.locked"); v != nil {
vs := v.(bool)
log.Printf("[DEBUG] Organization locked: %s", vs)
log.Printf("[DEBUG] Organization locked: %t", vs)
opts.Locked = &vs
}

2
builtin/providers/mailgun/resource_mailgun_domain_test.go
View File

@ -70,7 +70,7 @@ func testAccCheckMailgunDomainAttributes(DomainResp *mailgun.DomainResponse) res
}
if DomainResp.Domain.Wildcard != true {
return fmt.Errorf("Bad wildcard: %s", DomainResp.Domain.Wildcard)
return fmt.Errorf("Bad wildcard: %t", DomainResp.Domain.Wildcard)
}
if DomainResp.Domain.SmtpPassword != "foobar" {

2
command/remote.go
View File

@ -162,7 +162,7 @@ func (c *RemoteCommand) disableRemoteState() int {
}
defer fh.Close()
if err := terraform.WriteState(local, fh); err != nil {
c.Ui.Error(fmt.Sprintf("Failed to encode state file: %v",
c.Ui.Error(fmt.Sprintf("Failed to encode state file '%s': %v",
c.conf.statePath, err))
return 1
}