Make composite literals to use keyed fields

This will prevent following error:
 - * composite literal uses unkeyed fields
This commit is contained in:
Radek Simko 2015-02-18 18:26:59 +00:00
parent db729e5571
commit e149a97658
6 changed files with 10 additions and 8 deletions

View File

@ -336,7 +336,7 @@ func resourceAwsAutoscalingGroupDrain(d *schema.ResourceData, meta interface{})
return resource.Retry(10*time.Minute, func() error {
g, err := getAwsAutoscalingGroup(d, meta)
if err != nil {
return resource.RetryError{err}
return resource.RetryError{Err: err}
}
if g == nil {
return nil

View File

@ -42,7 +42,8 @@ func testAccCheckDBSubnetGroupDestroy(s *terraform.State) error {
}
// Try to find the resource
resp, err := conn.DescribeDBSubnetGroups(&rds.DescribeDBSubnetGroups{rs.Primary.ID})
resp, err := conn.DescribeDBSubnetGroups(
&rds.DescribeDBSubnetGroups{DBSubnetGroupName: rs.Primary.ID})
if err == nil {
if len(resp.DBSubnetGroups) > 0 {
return fmt.Errorf("still exist.")
@ -76,7 +77,8 @@ func testAccCheckDBSubnetGroupExists(n string, v *rds.DBSubnetGroup) resource.Te
}
conn := testAccProvider.Meta().(*AWSClient).rdsconn
resp, err := conn.DescribeDBSubnetGroups(&rds.DescribeDBSubnetGroups{rs.Primary.ID})
resp, err := conn.DescribeDBSubnetGroups(
&rds.DescribeDBSubnetGroups{DBSubnetGroupName: rs.Primary.ID})
if err != nil {
return err
}

View File

@ -219,7 +219,7 @@ func resourceAwsEipDelete(d *schema.ResourceData, meta interface{}) error {
return nil
}
if _, ok := err.(*ec2.Error); !ok {
return resource.RetryError{err}
return resource.RetryError{Err: err}
}
return err

View File

@ -124,7 +124,7 @@ func resourceAwsInternetGatewayDelete(d *schema.ResourceData, meta interface{})
return err // retry
}
return resource.RetryError{err}
return resource.RetryError{Err: err}
})
}

View File

@ -268,10 +268,10 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error
return fmt.Errorf("Dependency violation: Cannot delete acl %s: %s", d.Id(), err)
}
_, err = ec2conn.ReplaceNetworkAclAssociation(association.NetworkAclAssociationId, defaultAcl.NetworkAclId)
return resource.RetryError{err}
return resource.RetryError{Err: err}
default:
// Any other error, we want to quit the retry loop immediately
return resource.RetryError{err}
return resource.RetryError{Err: err}
}
}
log.Printf("[Info] Deleted network ACL %s successfully", d.Id())

View File

@ -380,7 +380,7 @@ func resourceAwsSecurityGroupDelete(d *schema.ResourceData, meta interface{}) er
return err
default:
// Any other error, we want to quit the retry loop immediately
return resource.RetryError{err}
return resource.RetryError{Err: err}
}
}