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

Merge pull request #3015 from hashicorp/f-aws-update-sdk9 

provider/aws: Update to aws-sdk 0.9.0 rc1
This commit is contained in:
Clint 2015-08-18 09:49:03 -05:00
parent 86ce5f13f1 0c2f189d08
commit 21d18ae2c9
97 changed files with 1128 additions and 1128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ func autoscalingTagsFromMap(m map[string]interface{}, resourceID string) []*auto
Key: aws.String(k), Key: aws.String(k),
Value: aws.String(attr["value"].(string)), Value: aws.String(attr["value"].(string)),
PropagateAtLaunch: aws.Bool(attr["propagate_at_launch"].(bool)), PropagateAtLaunch: aws.Bool(attr["propagate_at_launch"].(bool)),
ResourceID: aws.String(resourceID), ResourceId: aws.String(resourceID),
ResourceType: aws.String("auto-scaling-group"), ResourceType: aws.String("auto-scaling-group"),
}) })
} }

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

@ -217,7 +217,7 @@ func (c *Config) ValidateAccountId(iamconn *iam.IAM) error {
return fmt.Errorf("Failed getting account ID from IAM: %s", err) return fmt.Errorf("Failed getting account ID from IAM: %s", err)
} }
account_id := strings.Split(*out.User.ARN, ":")[4] account_id := strings.Split(*out.User.Arn, ":")[4]
if c.ForbiddenAccountIds != nil { if c.ForbiddenAccountIds != nil {
for _, id := range c.ForbiddenAccountIds { for _, id := range c.ForbiddenAccountIds {

18
builtin/providers/aws/network_acl_entry.go
View File

@ -9,8 +9,8 @@ import (
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
) )
func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2.NetworkACLEntry, error) { func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2.NetworkAclEntry, error) {
entries := make([]*ec2.NetworkACLEntry, 0, len(configured)) entries := make([]*ec2.NetworkAclEntry, 0, len(configured))
for _, eRaw := range configured { for _, eRaw := range configured {
data := eRaw.(map[string]interface{}) data := eRaw.(map[string]interface{})
protocol := data["protocol"].(string) protocol := data["protocol"].(string)
@ -23,7 +23,7 @@ func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2
} }
} }
e := &ec2.NetworkACLEntry{ e := &ec2.NetworkAclEntry{
Protocol: aws.String(strconv.Itoa(p)), Protocol: aws.String(strconv.Itoa(p)),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
From: aws.Int64(int64(data["from_port"].(int))), From: aws.Int64(int64(data["from_port"].(int))),
@ -32,17 +32,17 @@ func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2
Egress: aws.Bool((entryType == "egress")), Egress: aws.Bool((entryType == "egress")),
RuleAction: aws.String(data["action"].(string)), RuleAction: aws.String(data["action"].(string)),
RuleNumber: aws.Int64(int64(data["rule_no"].(int))), RuleNumber: aws.Int64(int64(data["rule_no"].(int))),
CIDRBlock: aws.String(data["cidr_block"].(string)), CidrBlock: aws.String(data["cidr_block"].(string)),
} }
// Specify additional required fields for ICMP // Specify additional required fields for ICMP
if p == 1 { if p == 1 {
e.ICMPTypeCode = &ec2.ICMPTypeCode{} e.IcmpTypeCode = &ec2.IcmpTypeCode{}
if v, ok := data["icmp_code"]; ok { if v, ok := data["icmp_code"]; ok {
e.ICMPTypeCode.Code = aws.Int64(int64(v.(int))) e.IcmpTypeCode.Code = aws.Int64(int64(v.(int)))
} }
if v, ok := data["icmp_type"]; ok { if v, ok := data["icmp_type"]; ok {
e.ICMPTypeCode.Type = aws.Int64(int64(v.(int))) e.IcmpTypeCode.Type = aws.Int64(int64(v.(int)))
} }
} }
@ -51,7 +51,7 @@ func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2
return entries, nil return entries, nil
} }
func flattenNetworkAclEntries(list []*ec2.NetworkACLEntry) []map[string]interface{} { func flattenNetworkAclEntries(list []*ec2.NetworkAclEntry) []map[string]interface{} {
entries := make([]map[string]interface{}, 0, len(list)) entries := make([]map[string]interface{}, 0, len(list))
for _, entry := range list { for _, entry := range list {
@ -61,7 +61,7 @@ func flattenNetworkAclEntries(list []*ec2.NetworkACLEntry) []map[string]interfac
"action": *entry.RuleAction, "action": *entry.RuleAction,
"rule_no": *entry.RuleNumber, "rule_no": *entry.RuleNumber,
"protocol": *entry.Protocol, "protocol": *entry.Protocol,
"cidr_block": *entry.CIDRBlock, "cidr_block": *entry.CidrBlock,
}) })
} }

24
builtin/providers/aws/network_acl_entry_test.go
View File

@ -37,8 +37,8 @@ func Test_expandNetworkACLEntry(t *testing.T) {
} }
expanded, _ := expandNetworkAclEntries(input, "egress") expanded, _ := expandNetworkAclEntries(input, "egress")
expected := []*ec2.NetworkACLEntry{ expected := []*ec2.NetworkAclEntry{
&ec2.NetworkACLEntry{ &ec2.NetworkAclEntry{
Protocol: aws.String("6"), Protocol: aws.String("6"),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
From: aws.Int64(22), From: aws.Int64(22),
@ -46,10 +46,10 @@ func Test_expandNetworkACLEntry(t *testing.T) {
}, },
RuleAction: aws.String("deny"), RuleAction: aws.String("deny"),
RuleNumber: aws.Int64(1), RuleNumber: aws.Int64(1),
CIDRBlock: aws.String("0.0.0.0/0"), CidrBlock: aws.String("0.0.0.0/0"),
Egress: aws.Bool(true), Egress: aws.Bool(true),
}, },
&ec2.NetworkACLEntry{ &ec2.NetworkAclEntry{
Protocol: aws.String("6"), Protocol: aws.String("6"),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
From: aws.Int64(443), From: aws.Int64(443),
@ -57,10 +57,10 @@ func Test_expandNetworkACLEntry(t *testing.T) {
}, },
RuleAction: aws.String("deny"), RuleAction: aws.String("deny"),
RuleNumber: aws.Int64(2), RuleNumber: aws.Int64(2),
CIDRBlock: aws.String("0.0.0.0/0"), CidrBlock: aws.String("0.0.0.0/0"),
Egress: aws.Bool(true), Egress: aws.Bool(true),
}, },
&ec2.NetworkACLEntry{ &ec2.NetworkAclEntry{
Protocol: aws.String("-1"), Protocol: aws.String("-1"),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
From: aws.Int64(443), From: aws.Int64(443),
@ -68,7 +68,7 @@ func Test_expandNetworkACLEntry(t *testing.T) {
}, },
RuleAction: aws.String("deny"), RuleAction: aws.String("deny"),
RuleNumber: aws.Int64(2), RuleNumber: aws.Int64(2),
CIDRBlock: aws.String("0.0.0.0/0"), CidrBlock: aws.String("0.0.0.0/0"),
Egress: aws.Bool(true), Egress: aws.Bool(true),
}, },
} }
@ -84,8 +84,8 @@ func Test_expandNetworkACLEntry(t *testing.T) {
func Test_flattenNetworkACLEntry(t *testing.T) { func Test_flattenNetworkACLEntry(t *testing.T) {
apiInput := []*ec2.NetworkACLEntry{ apiInput := []*ec2.NetworkAclEntry{
&ec2.NetworkACLEntry{ &ec2.NetworkAclEntry{
Protocol: aws.String("tcp"), Protocol: aws.String("tcp"),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
From: aws.Int64(22), From: aws.Int64(22),
@ -93,9 +93,9 @@ func Test_flattenNetworkACLEntry(t *testing.T) {
}, },
RuleAction: aws.String("deny"), RuleAction: aws.String("deny"),
RuleNumber: aws.Int64(1), RuleNumber: aws.Int64(1),
CIDRBlock: aws.String("0.0.0.0/0"), CidrBlock: aws.String("0.0.0.0/0"),
}, },
&ec2.NetworkACLEntry{ &ec2.NetworkAclEntry{
Protocol: aws.String("tcp"), Protocol: aws.String("tcp"),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
From: aws.Int64(443), From: aws.Int64(443),
@ -103,7 +103,7 @@ func Test_flattenNetworkACLEntry(t *testing.T) {
}, },
RuleAction: aws.String("deny"), RuleAction: aws.String("deny"),
RuleNumber: aws.Int64(2), RuleNumber: aws.Int64(2),
CIDRBlock: aws.String("0.0.0.0/0"), CidrBlock: aws.String("0.0.0.0/0"),
}, },
} }
flattened := flattenNetworkAclEntries(apiInput) flattened := flattenNetworkAclEntries(apiInput)

8
builtin/providers/aws/resource_aws_autoscaling_group.go
View File

@ -480,7 +480,7 @@ func waitForASGCapacity(d *schema.ResourceData, meta interface{}) error {
haveELB := 0 haveELB := 0
for _, i := range g.Instances { for _, i := range g.Instances {
if i.HealthStatus == nil || i.InstanceID == nil || i.LifecycleState == nil { if i.HealthStatus == nil || i.InstanceId == nil || i.LifecycleState == nil {
continue continue
} }
@ -497,7 +497,7 @@ func waitForASGCapacity(d *schema.ResourceData, meta interface{}) error {
if wantELB > 0 { if wantELB > 0 {
inAllLbs := true inAllLbs := true
for _, states := range lbis { for _, states := range lbis {
state, ok := states[*i.InstanceID] state, ok := states[*i.InstanceId]
if !ok || !strings.EqualFold(state, "InService") { if !ok || !strings.EqualFold(state, "InService") {
inAllLbs = false inAllLbs = false
} }
@ -535,10 +535,10 @@ func getLBInstanceStates(g *autoscaling.Group, meta interface{}) (map[string]map
return nil, err return nil, err
} }
for _, is := range r.InstanceStates { for _, is := range r.InstanceStates {
if is.InstanceID == nil || is.State == nil { if is.InstanceId == nil || is.State == nil {
continue continue
} }
lbInstanceStates[*lbName][*is.InstanceID] = *is.State lbInstanceStates[*lbName][*is.InstanceId] = *is.State
} }
} }

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

@ -219,7 +219,7 @@ func testAccCheckAWSAutoScalingGroupAttributes(group *autoscaling.Group) resourc
Value: aws.String("foo-bar"), Value: aws.String("foo-bar"),
PropagateAtLaunch: aws.Bool(true), PropagateAtLaunch: aws.Bool(true),
ResourceType: aws.String("auto-scaling-group"), ResourceType: aws.String("auto-scaling-group"),
ResourceID: group.AutoScalingGroupName, ResourceId: group.AutoScalingGroupName,
} }
if !reflect.DeepEqual(group.Tags[0], t) { if !reflect.DeepEqual(group.Tags[0], t) {

18
builtin/providers/aws/resource_aws_customer_gateway.go
View File

@ -48,8 +48,8 @@ func resourceAwsCustomerGatewayCreate(d *schema.ResourceData, meta interface{})
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
createOpts := &ec2.CreateCustomerGatewayInput{ createOpts := &ec2.CreateCustomerGatewayInput{
BGPASN: aws.Int64(int64(d.Get("bgp_asn").(int))), BgpAsn: aws.Int64(int64(d.Get("bgp_asn").(int))),
PublicIP: aws.String(d.Get("ip_address").(string)), PublicIp: aws.String(d.Get("ip_address").(string)),
Type: aws.String(d.Get("type").(string)), Type: aws.String(d.Get("type").(string)),
} }
@ -62,14 +62,14 @@ func resourceAwsCustomerGatewayCreate(d *schema.ResourceData, meta interface{})
// Store the ID // Store the ID
customerGateway := resp.CustomerGateway customerGateway := resp.CustomerGateway
d.SetId(*customerGateway.CustomerGatewayID) d.SetId(*customerGateway.CustomerGatewayId)
log.Printf("[INFO] Customer gateway ID: %s", *customerGateway.CustomerGatewayID) log.Printf("[INFO] Customer gateway ID: %s", *customerGateway.CustomerGatewayId)
// Wait for the CustomerGateway to be available. // Wait for the CustomerGateway to be available.
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"pending"}, Pending: []string{"pending"},
Target: "available", Target: "available",
Refresh: customerGatewayRefreshFunc(conn, *customerGateway.CustomerGatewayID), Refresh: customerGatewayRefreshFunc(conn, *customerGateway.CustomerGatewayId),
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
@ -79,7 +79,7 @@ func resourceAwsCustomerGatewayCreate(d *schema.ResourceData, meta interface{})
if stateErr != nil { if stateErr != nil {
return fmt.Errorf( return fmt.Errorf(
"Error waiting for customer gateway (%s) to become ready: %s", "Error waiting for customer gateway (%s) to become ready: %s",
*customerGateway.CustomerGatewayID, err) *customerGateway.CustomerGatewayId, err)
} }
// Create tags. // Create tags.
@ -145,8 +145,8 @@ func resourceAwsCustomerGatewayRead(d *schema.ResourceData, meta interface{}) er
} }
customerGateway := resp.CustomerGateways[0] customerGateway := resp.CustomerGateways[0]
d.Set("bgp_asn", customerGateway.BGPASN) d.Set("bgp_asn", customerGateway.BgpAsn)
d.Set("ip_address", customerGateway.IPAddress) d.Set("ip_address", customerGateway.IpAddress)
d.Set("type", customerGateway.Type) d.Set("type", customerGateway.Type)
d.Set("tags", tagsToMap(customerGateway.Tags)) d.Set("tags", tagsToMap(customerGateway.Tags))
@ -170,7 +170,7 @@ func resourceAwsCustomerGatewayDelete(d *schema.ResourceData, meta interface{})
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
_, err := conn.DeleteCustomerGateway(&ec2.DeleteCustomerGatewayInput{ _, err := conn.DeleteCustomerGateway(&ec2.DeleteCustomerGatewayInput{
CustomerGatewayID: aws.String(d.Id()), CustomerGatewayId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidCustomerGatewayID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidCustomerGatewayID.NotFound" {

20
builtin/providers/aws/resource_aws_db_instance.go
View File

@ -272,7 +272,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
Tags: tags, Tags: tags,
} }
if attr, ok := d.GetOk("iops"); ok { if attr, ok := d.GetOk("iops"); ok {
opts.IOPS = aws.Int64(int64(attr.(int))) opts.Iops = aws.Int64(int64(attr.(int)))
} }
if attr, ok := d.GetOk("port"); ok { if attr, ok := d.GetOk("port"); ok {
@ -315,7 +315,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
} }
if attr, ok := d.GetOk("iops"); ok { if attr, ok := d.GetOk("iops"); ok {
opts.IOPS = aws.Int64(int64(attr.(int))) opts.Iops = aws.Int64(int64(attr.(int)))
} }
if attr, ok := d.GetOk("license_model"); ok { if attr, ok := d.GetOk("license_model"); ok {
@ -339,7 +339,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
} }
if attr, ok := d.GetOk("tde_credential_arn"); ok { if attr, ok := d.GetOk("tde_credential_arn"); ok {
opts.TDECredentialARN = aws.String(attr.(string)) opts.TdeCredentialArn = aws.String(attr.(string))
} }
if attr, ok := d.GetOk("storage_type"); ok { if attr, ok := d.GetOk("storage_type"); ok {
@ -390,7 +390,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
for _, v := range attr.List() { for _, v := range attr.List() {
s = append(s, aws.String(v.(string))) s = append(s, aws.String(v.(string)))
} }
opts.VPCSecurityGroupIDs = s opts.VpcSecurityGroupIds = s
} }
if attr := d.Get("security_group_names").(*schema.Set); attr.Len() > 0 { if attr := d.Get("security_group_names").(*schema.Set); attr.Len() > 0 {
@ -409,7 +409,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
} }
if attr, ok := d.GetOk("iops"); ok { if attr, ok := d.GetOk("iops"); ok {
opts.IOPS = aws.Int64(int64(attr.(int))) opts.Iops = aws.Int64(int64(attr.(int)))
} }
if attr, ok := d.GetOk("port"); ok { if attr, ok := d.GetOk("port"); ok {
@ -533,8 +533,8 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error {
ids := &schema.Set{ ids := &schema.Set{
F: schema.HashString, F: schema.HashString,
} }
for _, v := range v.VPCSecurityGroups { for _, v := range v.VpcSecurityGroups {
ids.Add(*v.VPCSecurityGroupID) ids.Add(*v.VpcSecurityGroupId)
} }
d.Set("vpc_security_group_ids", ids) d.Set("vpc_security_group_ids", ids)
@ -638,7 +638,7 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error
} }
if d.HasChange("iops") { if d.HasChange("iops") {
d.SetPartial("iops") d.SetPartial("iops")
req.IOPS = aws.Int64(int64(d.Get("iops").(int))) req.Iops = aws.Int64(int64(d.Get("iops").(int)))
requestUpdate = true requestUpdate = true
} }
if d.HasChange("backup_window") { if d.HasChange("backup_window") {
@ -673,7 +673,7 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error
for _, v := range attr.List() { for _, v := range attr.List() {
s = append(s, aws.String(v.(string))) s = append(s, aws.String(v.(string)))
} }
req.VPCSecurityGroupIDs = s req.VpcSecurityGroupIds = s
} }
requestUpdate = true requestUpdate = true
} }
@ -791,7 +791,7 @@ func buildRDSARN(d *schema.ResourceData, meta interface{}) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
userARN := *resp.User.ARN userARN := *resp.User.Arn
accountID := strings.Split(userARN, ":")[4] accountID := strings.Split(userARN, ":")[4]
arn := fmt.Sprintf("arn:aws:rds:%s:%s:db:%s", region, accountID, d.Id()) arn := fmt.Sprintf("arn:aws:rds:%s:%s:db:%s", region, accountID, d.Id())
return arn, nil return arn, nil

8
builtin/providers/aws/resource_aws_db_security_group.go
View File

@ -149,8 +149,8 @@ func resourceAwsDbSecurityGroupRead(d *schema.ResourceData, meta interface{}) er
for _, g := range sg.EC2SecurityGroups { for _, g := range sg.EC2SecurityGroups {
rule := map[string]interface{}{ rule := map[string]interface{}{
"security_group_name": *g.EC2SecurityGroupName, "security_group_name": *g.EC2SecurityGroupName,
"security_group_id": *g.EC2SecurityGroupID, "security_group_id": *g.EC2SecurityGroupId,
"security_group_owner_id": *g.EC2SecurityGroupOwnerID, "security_group_owner_id": *g.EC2SecurityGroupOwnerId,
} }
rules.Add(rule) rules.Add(rule)
} }
@ -221,11 +221,11 @@ func resourceAwsDbSecurityGroupAuthorizeRule(ingress interface{}, dbSecurityGrou
} }
if attr, ok := ing["security_group_id"]; ok && attr != "" { if attr, ok := ing["security_group_id"]; ok && attr != "" {
opts.EC2SecurityGroupID = aws.String(attr.(string)) opts.EC2SecurityGroupId = aws.String(attr.(string))
} }
if attr, ok := ing["security_group_owner_id"]; ok && attr != "" { if attr, ok := ing["security_group_owner_id"]; ok && attr != "" {
opts.EC2SecurityGroupOwnerID = aws.String(attr.(string)) opts.EC2SecurityGroupOwnerId = aws.String(attr.(string))
} }
log.Printf("[DEBUG] Authorize ingress rule configuration: %#v", opts) log.Printf("[DEBUG] Authorize ingress rule configuration: %#v", opts)

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

@ -72,7 +72,7 @@ func resourceAwsDbSubnetGroupCreate(d *schema.ResourceData, meta interface{}) er
createOpts := rds.CreateDBSubnetGroupInput{ createOpts := rds.CreateDBSubnetGroupInput{
DBSubnetGroupName: aws.String(d.Get("name").(string)), DBSubnetGroupName: aws.String(d.Get("name").(string)),
DBSubnetGroupDescription: aws.String(d.Get("description").(string)), DBSubnetGroupDescription: aws.String(d.Get("description").(string)),
SubnetIDs: subnetIds, SubnetIds: subnetIds,
} }
log.Printf("[DEBUG] Create DB Subnet Group: %#v", createOpts) log.Printf("[DEBUG] Create DB Subnet Group: %#v", createOpts)

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

@ -579,7 +579,7 @@ func resourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) erro
} }
d.Set("global_secondary_index", gsiList) d.Set("global_secondary_index", gsiList)
d.Set("arn", table.TableARN) d.Set("arn", table.TableArn)
return nil return nil
} }

32
builtin/providers/aws/resource_aws_ebs_volume.go
View File

@ -77,16 +77,16 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
request.Encrypted = aws.Bool(value.(bool)) request.Encrypted = aws.Bool(value.(bool))
} }
if value, ok := d.GetOk("iops"); ok { if value, ok := d.GetOk("iops"); ok {
request.IOPS = aws.Int64(int64(value.(int))) request.Iops = aws.Int64(int64(value.(int)))
} }
if value, ok := d.GetOk("kms_key_id"); ok { if value, ok := d.GetOk("kms_key_id"); ok {
request.KMSKeyID = aws.String(value.(string)) request.KmsKeyId = aws.String(value.(string))
} }
if value, ok := d.GetOk("size"); ok { if value, ok := d.GetOk("size"); ok {
request.Size = aws.Int64(int64(value.(int))) request.Size = aws.Int64(int64(value.(int)))
} }
if value, ok := d.GetOk("snapshot_id"); ok { if value, ok := d.GetOk("snapshot_id"); ok {
request.SnapshotID = aws.String(value.(string)) request.SnapshotId = aws.String(value.(string))
} }
if value, ok := d.GetOk("type"); ok { if value, ok := d.GetOk("type"); ok {
request.VolumeType = aws.String(value.(string)) request.VolumeType = aws.String(value.(string))
@ -104,7 +104,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"creating"}, Pending: []string{"creating"},
Target: "available", Target: "available",
Refresh: volumeStateRefreshFunc(conn, *result.VolumeID), Refresh: volumeStateRefreshFunc(conn, *result.VolumeId),
Timeout: 5 * time.Minute, Timeout: 5 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
@ -114,10 +114,10 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf(
"Error waiting for Volume (%s) to become available: %s", "Error waiting for Volume (%s) to become available: %s",
*result.VolumeID, err) *result.VolumeId, err)
} }
d.SetId(*result.VolumeID) d.SetId(*result.VolumeId)
if _, ok := d.GetOk("tags"); ok { if _, ok := d.GetOk("tags"); ok {
setTags(conn, d) setTags(conn, d)
@ -139,7 +139,7 @@ func resourceAWSEbsVolumeUpdate(d *schema.ResourceData, meta interface{}) error
func volumeStateRefreshFunc(conn *ec2.EC2, volumeID string) resource.StateRefreshFunc { func volumeStateRefreshFunc(conn *ec2.EC2, volumeID string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ resp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{
VolumeIDs: []*string{aws.String(volumeID)}, VolumeIds: []*string{aws.String(volumeID)},
}) })
if err != nil { if err != nil {
@ -163,7 +163,7 @@ func resourceAwsEbsVolumeRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
request := &ec2.DescribeVolumesInput{ request := &ec2.DescribeVolumesInput{
VolumeIDs: []*string{aws.String(d.Id())}, VolumeIds: []*string{aws.String(d.Id())},
} }
response, err := conn.DescribeVolumes(request) response, err := conn.DescribeVolumes(request)
@ -182,7 +182,7 @@ func resourceAwsEbsVolumeDelete(d *schema.ResourceData, meta interface{}) error
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
request := &ec2.DeleteVolumeInput{ request := &ec2.DeleteVolumeInput{
VolumeID: aws.String(d.Id()), VolumeId: aws.String(d.Id()),
} }
_, err := conn.DeleteVolume(request) _, err := conn.DeleteVolume(request)
@ -193,23 +193,23 @@ func resourceAwsEbsVolumeDelete(d *schema.ResourceData, meta interface{}) error
} }
func readVolume(d *schema.ResourceData, volume *ec2.Volume) error { func readVolume(d *schema.ResourceData, volume *ec2.Volume) error {
d.SetId(*volume.VolumeID) d.SetId(*volume.VolumeId)
d.Set("availability_zone", *volume.AvailabilityZone) d.Set("availability_zone", *volume.AvailabilityZone)
if volume.Encrypted != nil { if volume.Encrypted != nil {
d.Set("encrypted", *volume.Encrypted) d.Set("encrypted", *volume.Encrypted)
} }
if volume.IOPS != nil { if volume.Iops != nil {
d.Set("iops", *volume.IOPS) d.Set("iops", *volume.Iops)
} }
if volume.KMSKeyID != nil { if volume.KmsKeyId != nil {
d.Set("kms_key_id", *volume.KMSKeyID) d.Set("kms_key_id", *volume.KmsKeyId)
} }
if volume.Size != nil { if volume.Size != nil {
d.Set("size", *volume.Size) d.Set("size", *volume.Size)
} }
if volume.SnapshotID != nil { if volume.SnapshotId != nil {
d.Set("snapshot_id", *volume.SnapshotID) d.Set("snapshot_id", *volume.SnapshotId)
} }
if volume.VolumeType != nil { if volume.VolumeType != nil {
d.Set("type", *volume.VolumeType) d.Set("type", *volume.VolumeType)

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

@ -56,7 +56,7 @@ func testAccCheckVolumeExists(n string, v *ec2.Volume) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
request := &ec2.DescribeVolumesInput{ request := &ec2.DescribeVolumesInput{
VolumeIDs: []*string{aws.String(rs.Primary.ID)}, VolumeIds: []*string{aws.String(rs.Primary.ID)},
} }
response, err := conn.DescribeVolumes(request) response, err := conn.DescribeVolumes(request)

6
builtin/providers/aws/resource_aws_ecs_cluster.go
View File

@ -39,9 +39,9 @@ func resourceAwsEcsClusterCreate(d *schema.ResourceData, meta interface{}) error
if err != nil { if err != nil {
return err return err
} }
log.Printf("[DEBUG] ECS cluster %s created", *out.Cluster.ClusterARN) log.Printf("[DEBUG] ECS cluster %s created", *out.Cluster.ClusterArn)
d.SetId(*out.Cluster.ClusterARN) d.SetId(*out.Cluster.ClusterArn)
d.Set("name", *out.Cluster.ClusterName) d.Set("name", *out.Cluster.ClusterName)
return nil return nil
} }
@ -59,7 +59,7 @@ func resourceAwsEcsClusterRead(d *schema.ResourceData, meta interface{}) error {
} }
log.Printf("[DEBUG] Received ECS clusters: %s", out.Clusters) log.Printf("[DEBUG] Received ECS clusters: %s", out.Clusters)
d.SetId(*out.Clusters[0].ClusterARN) d.SetId(*out.Clusters[0].ClusterArn)
d.Set("name", *out.Clusters[0].ClusterName) d.Set("name", *out.Clusters[0].ClusterName)
return nil return nil

18
builtin/providers/aws/resource_aws_ecs_service.go
View File

@ -112,9 +112,9 @@ func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error
service := *out.Service service := *out.Service
log.Printf("[DEBUG] ECS service created: %s", *service.ServiceARN) log.Printf("[DEBUG] ECS service created: %s", *service.ServiceArn)
d.SetId(*service.ServiceARN) d.SetId(*service.ServiceArn)
d.Set("cluster", *service.ClusterARN) d.Set("cluster", *service.ClusterArn)
return resourceAwsEcsServiceUpdate(d, meta) return resourceAwsEcsServiceUpdate(d, meta)
} }
@ -140,7 +140,7 @@ func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error {
service := out.Services[0] service := out.Services[0]
log.Printf("[DEBUG] Received ECS service %s", service) log.Printf("[DEBUG] Received ECS service %s", service)
d.SetId(*service.ServiceARN) d.SetId(*service.ServiceArn)
d.Set("name", *service.ServiceName) d.Set("name", *service.ServiceName)
// Save task definition in the same format // Save task definition in the same format
@ -152,10 +152,10 @@ func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error {
} }
d.Set("desired_count", *service.DesiredCount) d.Set("desired_count", *service.DesiredCount)
d.Set("cluster", *service.ClusterARN) d.Set("cluster", *service.ClusterArn)
if service.RoleARN != nil { if service.RoleArn != nil {
d.Set("iam_role", *service.RoleARN) d.Set("iam_role", *service.RoleArn)
} }
if service.LoadBalancers != nil { if service.LoadBalancers != nil {
@ -259,7 +259,7 @@ func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error
return err return err
} }
log.Printf("[DEBUG] ECS service %s deleted.", *out.Service.ServiceARN) log.Printf("[DEBUG] ECS service %s deleted.", *out.Service.ServiceArn)
return nil return nil
} }
@ -299,7 +299,7 @@ func buildTaskDefinitionARN(taskDefinition string, meta interface{}) (string, er
} }
// arn:aws:iam::0123456789:user/username // arn:aws:iam::0123456789:user/username
userARN := *resp.User.ARN userARN := *resp.User.Arn
accountID := strings.Split(userARN, ":")[4] accountID := strings.Split(userARN, ":")[4]
// arn:aws:ecs:us-west-2:01234567890:task-definition/mongodb:3 // arn:aws:ecs:us-west-2:01234567890:task-definition/mongodb:3

6
builtin/providers/aws/resource_aws_ecs_task_definition.go
View File

@ -99,10 +99,10 @@ func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{}
taskDefinition := *out.TaskDefinition taskDefinition := *out.TaskDefinition
log.Printf("[DEBUG] ECS task definition registered: %q (rev. %d)", log.Printf("[DEBUG] ECS task definition registered: %q (rev. %d)",
*taskDefinition.TaskDefinitionARN, *taskDefinition.Revision) *taskDefinition.TaskDefinitionArn, *taskDefinition.Revision)
d.SetId(*taskDefinition.Family) d.SetId(*taskDefinition.Family)
d.Set("arn", *taskDefinition.TaskDefinitionARN) d.Set("arn", *taskDefinition.TaskDefinitionArn)
return resourceAwsEcsTaskDefinitionRead(d, meta) return resourceAwsEcsTaskDefinitionRead(d, meta)
} }
@ -122,7 +122,7 @@ func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{})
taskDefinition := out.TaskDefinition taskDefinition := out.TaskDefinition
d.SetId(*taskDefinition.Family) d.SetId(*taskDefinition.Family)
d.Set("arn", *taskDefinition.TaskDefinitionARN) d.Set("arn", *taskDefinition.TaskDefinitionArn)
d.Set("family", *taskDefinition.Family) d.Set("family", *taskDefinition.Family)
d.Set("revision", *taskDefinition.Revision) d.Set("revision", *taskDefinition.Revision)
d.Set("container_definitions", taskDefinition.ContainerDefinitions) d.Set("container_definitions", taskDefinition.ContainerDefinitions)

44
builtin/providers/aws/resource_aws_eip.go
View File

@ -95,9 +95,9 @@ func resourceAwsEipCreate(d *schema.ResourceData, meta interface{}) error {
// it defaults to using the public IP // it defaults to using the public IP
log.Printf("[DEBUG] EIP Allocate: %#v", allocResp) log.Printf("[DEBUG] EIP Allocate: %#v", allocResp)
if d.Get("domain").(string) == "vpc" { if d.Get("domain").(string) == "vpc" {
d.SetId(*allocResp.AllocationID) d.SetId(*allocResp.AllocationId)
} else { } else {
d.SetId(*allocResp.PublicIP) d.SetId(*allocResp.PublicIp)
} }
log.Printf("[INFO] EIP ID: %s (domain: %v)", d.Id(), *allocResp.Domain) log.Printf("[INFO] EIP ID: %s (domain: %v)", d.Id(), *allocResp.Domain)
@ -113,9 +113,9 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
req := &ec2.DescribeAddressesInput{} req := &ec2.DescribeAddressesInput{}
if domain == "vpc" { if domain == "vpc" {
req.AllocationIDs = []*string{aws.String(id)} req.AllocationIds = []*string{aws.String(id)}
} else { } else {
req.PublicIPs = []*string{aws.String(id)} req.PublicIps = []*string{aws.String(id)}
} }
log.Printf( log.Printf(
@ -134,8 +134,8 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
// Verify AWS returned our EIP // Verify AWS returned our EIP
if len(describeAddresses.Addresses) != 1 || if len(describeAddresses.Addresses) != 1 ||
(domain == "vpc" && *describeAddresses.Addresses[0].AllocationID != id) || (domain == "vpc" && *describeAddresses.Addresses[0].AllocationId != id) ||
*describeAddresses.Addresses[0].PublicIP != id { *describeAddresses.Addresses[0].PublicIp != id {
if err != nil { if err != nil {
return fmt.Errorf("Unable to find EIP: %#v", describeAddresses.Addresses) return fmt.Errorf("Unable to find EIP: %#v", describeAddresses.Addresses)
} }
@ -143,15 +143,15 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
address := describeAddresses.Addresses[0] address := describeAddresses.Addresses[0]
d.Set("association_id", address.AssociationID) d.Set("association_id", address.AssociationId)
if address.InstanceID != nil { if address.InstanceId != nil {
d.Set("instance", address.InstanceID) d.Set("instance", address.InstanceId)
} }
if address.NetworkInterfaceID != nil { if address.NetworkInterfaceId != nil {
d.Set("network_interface", address.NetworkInterfaceID) d.Set("network_interface", address.NetworkInterfaceId)
} }
d.Set("private_ip", address.PrivateIPAddress) d.Set("private_ip", address.PrivateIpAddress)
d.Set("public_ip", address.PublicIP) d.Set("public_ip", address.PublicIp)
return nil return nil
} }
@ -170,16 +170,16 @@ func resourceAwsEipUpdate(d *schema.ResourceData, meta interface{}) error {
networkInterfaceId := v_interface.(string) networkInterfaceId := v_interface.(string)
assocOpts := &ec2.AssociateAddressInput{ assocOpts := &ec2.AssociateAddressInput{
InstanceID: aws.String(instanceId), InstanceId: aws.String(instanceId),
PublicIP: aws.String(d.Id()), PublicIp: aws.String(d.Id()),
} }
// more unique ID conditionals // more unique ID conditionals
if domain == "vpc" { if domain == "vpc" {
assocOpts = &ec2.AssociateAddressInput{ assocOpts = &ec2.AssociateAddressInput{
NetworkInterfaceID: aws.String(networkInterfaceId), NetworkInterfaceId: aws.String(networkInterfaceId),
InstanceID: aws.String(instanceId), InstanceId: aws.String(instanceId),
AllocationID: aws.String(d.Id()), AllocationId: aws.String(d.Id()),
} }
} }
@ -215,11 +215,11 @@ func resourceAwsEipDelete(d *schema.ResourceData, meta interface{}) error {
switch resourceAwsEipDomain(d) { switch resourceAwsEipDomain(d) {
case "vpc": case "vpc":
_, err = ec2conn.DisassociateAddress(&ec2.DisassociateAddressInput{ _, err = ec2conn.DisassociateAddress(&ec2.DisassociateAddressInput{
AssociationID: aws.String(d.Get("association_id").(string)), AssociationId: aws.String(d.Get("association_id").(string)),
}) })
case "standard": case "standard":
_, err = ec2conn.DisassociateAddress(&ec2.DisassociateAddressInput{ _, err = ec2conn.DisassociateAddress(&ec2.DisassociateAddressInput{
PublicIP: aws.String(d.Get("public_ip").(string)), PublicIp: aws.String(d.Get("public_ip").(string)),
}) })
} }
@ -247,12 +247,12 @@ func resourceAwsEipDelete(d *schema.ResourceData, meta interface{}) error {
"[DEBUG] EIP release (destroy) address allocation: %v", "[DEBUG] EIP release (destroy) address allocation: %v",
d.Id()) d.Id())
_, err = ec2conn.ReleaseAddress(&ec2.ReleaseAddressInput{ _, err = ec2conn.ReleaseAddress(&ec2.ReleaseAddressInput{
AllocationID: aws.String(d.Id()), AllocationId: aws.String(d.Id()),
}) })
case "standard": case "standard":
log.Printf("[DEBUG] EIP release (destroy) address: %v", d.Id()) log.Printf("[DEBUG] EIP release (destroy) address: %v", d.Id())
_, err = ec2conn.ReleaseAddress(&ec2.ReleaseAddressInput{ _, err = ec2conn.ReleaseAddress(&ec2.ReleaseAddressInput{
PublicIP: aws.String(d.Id()), PublicIp: aws.String(d.Id()),
}) })
} }

16
builtin/providers/aws/resource_aws_eip_test.go
View File

@ -87,13 +87,13 @@ func testAccCheckAWSEIPDestroy(s *terraform.State) error {
} }
req := &ec2.DescribeAddressesInput{ req := &ec2.DescribeAddressesInput{
PublicIPs: []*string{aws.String(rs.Primary.ID)}, PublicIps: []*string{aws.String(rs.Primary.ID)},
} }
describe, err := conn.DescribeAddresses(req) describe, err := conn.DescribeAddresses(req)
if err == nil { if err == nil {
if len(describe.Addresses) != 0 && if len(describe.Addresses) != 0 &&
*describe.Addresses[0].PublicIP == rs.Primary.ID { *describe.Addresses[0].PublicIp == rs.Primary.ID {
return fmt.Errorf("EIP still exists") return fmt.Errorf("EIP still exists")
} }
} }
@ -114,7 +114,7 @@ func testAccCheckAWSEIPDestroy(s *terraform.State) error {
func testAccCheckAWSEIPAttributes(conf *ec2.Address) resource.TestCheckFunc { func testAccCheckAWSEIPAttributes(conf *ec2.Address) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
if *conf.PublicIP == "" { if *conf.PublicIp == "" {
return fmt.Errorf("empty public_ip") return fmt.Errorf("empty public_ip")
} }
@ -124,7 +124,7 @@ func testAccCheckAWSEIPAttributes(conf *ec2.Address) resource.TestCheckFunc {
func testAccCheckAWSEIPAssociated(conf *ec2.Address) resource.TestCheckFunc { func testAccCheckAWSEIPAssociated(conf *ec2.Address) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
if *conf.AssociationID == "" { if *conf.AssociationId == "" {
return fmt.Errorf("empty association_id") return fmt.Errorf("empty association_id")
} }
@ -147,7 +147,7 @@ func testAccCheckAWSEIPExists(n string, res *ec2.Address) resource.TestCheckFunc
if strings.Contains(rs.Primary.ID, "eipalloc") { if strings.Contains(rs.Primary.ID, "eipalloc") {
req := &ec2.DescribeAddressesInput{ req := &ec2.DescribeAddressesInput{
AllocationIDs: []*string{aws.String(rs.Primary.ID)}, AllocationIds: []*string{aws.String(rs.Primary.ID)},
} }
describe, err := conn.DescribeAddresses(req) describe, err := conn.DescribeAddresses(req)
if err != nil { if err != nil {
@ -155,14 +155,14 @@ func testAccCheckAWSEIPExists(n string, res *ec2.Address) resource.TestCheckFunc
} }
if len(describe.Addresses) != 1 || if len(describe.Addresses) != 1 ||
*describe.Addresses[0].AllocationID != rs.Primary.ID { *describe.Addresses[0].AllocationId != rs.Primary.ID {
return fmt.Errorf("EIP not found") return fmt.Errorf("EIP not found")
} }
*res = *describe.Addresses[0] *res = *describe.Addresses[0]
} else { } else {
req := &ec2.DescribeAddressesInput{ req := &ec2.DescribeAddressesInput{
PublicIPs: []*string{aws.String(rs.Primary.ID)}, PublicIps: []*string{aws.String(rs.Primary.ID)},
} }
describe, err := conn.DescribeAddresses(req) describe, err := conn.DescribeAddresses(req)
if err != nil { if err != nil {
@ -170,7 +170,7 @@ func testAccCheckAWSEIPExists(n string, res *ec2.Address) resource.TestCheckFunc
} }
if len(describe.Addresses) != 1 || if len(describe.Addresses) != 1 ||
*describe.Addresses[0].PublicIP != rs.Primary.ID { *describe.Addresses[0].PublicIp != rs.Primary.ID {
return fmt.Errorf("EIP not found") return fmt.Errorf("EIP not found")
} }
*res = *describe.Addresses[0] *res = *describe.Addresses[0]

38
builtin/providers/aws/resource_aws_elasticache_cluster.go
View File

@ -157,7 +157,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{
tags := tagsFromMapEC(d.Get("tags").(map[string]interface{})) tags := tagsFromMapEC(d.Get("tags").(map[string]interface{}))
req := &elasticache.CreateCacheClusterInput{ req := &elasticache.CreateCacheClusterInput{
CacheClusterID: aws.String(clusterId), CacheClusterId: aws.String(clusterId),
CacheNodeType: aws.String(nodeType), CacheNodeType: aws.String(nodeType),
NumCacheNodes: aws.Int64(numNodes), NumCacheNodes: aws.Int64(numNodes),
Engine: aws.String(engine), Engine: aws.String(engine),
@ -165,7 +165,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{
Port: aws.Int64(port), Port: aws.Int64(port),
CacheSubnetGroupName: aws.String(subnetGroupName), CacheSubnetGroupName: aws.String(subnetGroupName),
CacheSecurityGroupNames: securityNames, CacheSecurityGroupNames: securityNames,
SecurityGroupIDs: securityIds, SecurityGroupIds: securityIds,
Tags: tags, Tags: tags,
} }
@ -181,7 +181,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{
snaps := d.Get("snapshot_arns").(*schema.Set).List() snaps := d.Get("snapshot_arns").(*schema.Set).List()
if len(snaps) > 0 { if len(snaps) > 0 {
s := expandStringList(snaps) s := expandStringList(snaps)
req.SnapshotARNs = s req.SnapshotArns = s
log.Printf("[DEBUG] Restoring Redis cluster from S3 snapshot: %#v", s) log.Printf("[DEBUG] Restoring Redis cluster from S3 snapshot: %#v", s)
} }
@ -190,7 +190,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{
return fmt.Errorf("Error creating Elasticache: %s", err) return fmt.Errorf("Error creating Elasticache: %s", err)
} }
d.SetId(*resp.CacheCluster.CacheClusterID) d.SetId(*resp.CacheCluster.CacheClusterId)
pending := []string{"creating"} pending := []string{"creating"}
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
@ -214,7 +214,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{
func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).elasticacheconn conn := meta.(*AWSClient).elasticacheconn
req := &elasticache.DescribeCacheClustersInput{ req := &elasticache.DescribeCacheClustersInput{
CacheClusterID: aws.String(d.Id()), CacheClusterId: aws.String(d.Id()),
ShowCacheNodeInfo: aws.Bool(true), ShowCacheNodeInfo: aws.Bool(true),
} }
@ -225,7 +225,7 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{})
if len(res.CacheClusters) == 1 { if len(res.CacheClusters) == 1 {
c := res.CacheClusters[0] c := res.CacheClusters[0]
d.Set("cluster_id", c.CacheClusterID) d.Set("cluster_id", c.CacheClusterId)
d.Set("node_type", c.CacheNodeType) d.Set("node_type", c.CacheNodeType)
d.Set("num_cache_nodes", c.NumCacheNodes) d.Set("num_cache_nodes", c.NumCacheNodes)
d.Set("engine", c.Engine) d.Set("engine", c.Engine)
@ -246,7 +246,7 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{})
// set tags // set tags
arn, err := buildECARN(d, meta) arn, err := buildECARN(d, meta)
if err != nil { if err != nil {
log.Printf("[DEBUG] Error building ARN for ElastiCache Cluster, not setting Tags for cluster %s", *c.CacheClusterID) log.Printf("[DEBUG] Error building ARN for ElastiCache Cluster, not setting Tags for cluster %s", *c.CacheClusterId)
} else { } else {
resp, err := conn.ListTagsForResource(&elasticache.ListTagsForResourceInput{ resp, err := conn.ListTagsForResource(&elasticache.ListTagsForResourceInput{
ResourceName: aws.String(arn), ResourceName: aws.String(arn),
@ -279,14 +279,14 @@ func resourceAwsElasticacheClusterUpdate(d *schema.ResourceData, meta interface{
} }
req := &elasticache.ModifyCacheClusterInput{ req := &elasticache.ModifyCacheClusterInput{
CacheClusterID: aws.String(d.Id()), CacheClusterId: aws.String(d.Id()),
ApplyImmediately: aws.Bool(d.Get("apply_immediately").(bool)), ApplyImmediately: aws.Bool(d.Get("apply_immediately").(bool)),
} }
requestUpdate := false requestUpdate := false
if d.HasChange("security_group_ids") { if d.HasChange("security_group_ids") {
if attr := d.Get("security_group_ids").(*schema.Set); attr.Len() > 0 { if attr := d.Get("security_group_ids").(*schema.Set); attr.Len() > 0 {
req.SecurityGroupIDs = expandStringList(attr.List()) req.SecurityGroupIds = expandStringList(attr.List())
requestUpdate = true requestUpdate = true
} }
} }
@ -346,11 +346,11 @@ func setCacheNodeData(d *schema.ResourceData, c *elasticache.CacheCluster) error
cacheNodeData := make([]map[string]interface{}, 0, len(sortedCacheNodes)) cacheNodeData := make([]map[string]interface{}, 0, len(sortedCacheNodes))
for _, node := range sortedCacheNodes { for _, node := range sortedCacheNodes {
if node.CacheNodeID == nil || node.Endpoint == nil || node.Endpoint.Address == nil || node.Endpoint.Port == nil { if node.CacheNodeId == nil || node.Endpoint == nil || node.Endpoint.Address == nil || node.Endpoint.Port == nil {
return fmt.Errorf("Unexpected nil pointer in: %s", node) return fmt.Errorf("Unexpected nil pointer in: %s", node)
} }
cacheNodeData = append(cacheNodeData, map[string]interface{}{ cacheNodeData = append(cacheNodeData, map[string]interface{}{
"id": *node.CacheNodeID, "id": *node.CacheNodeId,
"address": *node.Endpoint.Address, "address": *node.Endpoint.Address,
"port": int(*node.Endpoint.Port), "port": int(*node.Endpoint.Port),
}) })
@ -364,15 +364,15 @@ type byCacheNodeId []*elasticache.CacheNode
func (b byCacheNodeId) Len() int { return len(b) } func (b byCacheNodeId) Len() int { return len(b) }
func (b byCacheNodeId) Swap(i, j int) { b[i], b[j] = b[j], b[i] } func (b byCacheNodeId) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
func (b byCacheNodeId) Less(i, j int) bool { func (b byCacheNodeId) Less(i, j int) bool {
return b[i].CacheNodeID != nil && b[j].CacheNodeID != nil && return b[i].CacheNodeId != nil && b[j].CacheNodeId != nil &&
*b[i].CacheNodeID < *b[j].CacheNodeID *b[i].CacheNodeId < *b[j].CacheNodeId
} }
func resourceAwsElasticacheClusterDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsElasticacheClusterDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).elasticacheconn conn := meta.(*AWSClient).elasticacheconn
req := &elasticache.DeleteCacheClusterInput{ req := &elasticache.DeleteCacheClusterInput{
CacheClusterID: aws.String(d.Id()), CacheClusterId: aws.String(d.Id()),
} }
_, err := conn.DeleteCacheCluster(req) _, err := conn.DeleteCacheCluster(req)
if err != nil { if err != nil {
@ -402,7 +402,7 @@ func resourceAwsElasticacheClusterDelete(d *schema.ResourceData, meta interface{
func cacheClusterStateRefreshFunc(conn *elasticache.ElastiCache, clusterID, givenState string, pending []string) resource.StateRefreshFunc { func cacheClusterStateRefreshFunc(conn *elasticache.ElastiCache, clusterID, givenState string, pending []string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{ resp, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{
CacheClusterID: aws.String(clusterID), CacheClusterId: aws.String(clusterID),
ShowCacheNodeInfo: aws.Bool(true), ShowCacheNodeInfo: aws.Bool(true),
}) })
if err != nil { if err != nil {
@ -423,8 +423,8 @@ func cacheClusterStateRefreshFunc(conn *elasticache.ElastiCache, clusterID, give
var c *elasticache.CacheCluster var c *elasticache.CacheCluster
for _, cluster := range resp.CacheClusters { for _, cluster := range resp.CacheClusters {
if *cluster.CacheClusterID == clusterID { if *cluster.CacheClusterId == clusterID {
log.Printf("[DEBUG] Found matching ElastiCache cluster: %s", *cluster.CacheClusterID) log.Printf("[DEBUG] Found matching ElastiCache cluster: %s", *cluster.CacheClusterId)
c = cluster c = cluster
} }
} }
@ -459,7 +459,7 @@ func cacheClusterStateRefreshFunc(conn *elasticache.ElastiCache, clusterID, give
for _, n := range c.CacheNodes { for _, n := range c.CacheNodes {
log.Printf("[DEBUG] Checking cache node for status: %s", n) log.Printf("[DEBUG] Checking cache node for status: %s", n)
if n.CacheNodeStatus != nil && *n.CacheNodeStatus != "available" { if n.CacheNodeStatus != nil && *n.CacheNodeStatus != "available" {
log.Printf("[DEBUG] Node (%s) is not yet available, status: %s", *n.CacheNodeID, *n.CacheNodeStatus) log.Printf("[DEBUG] Node (%s) is not yet available, status: %s", *n.CacheNodeId, *n.CacheNodeStatus)
return nil, "creating", nil return nil, "creating", nil
} }
log.Printf("[DEBUG] Cache node not in expected state") log.Printf("[DEBUG] Cache node not in expected state")
@ -480,7 +480,7 @@ func buildECARN(d *schema.ResourceData, meta interface{}) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
userARN := *resp.User.ARN userARN := *resp.User.Arn
accountID := strings.Split(userARN, ":")[4] accountID := strings.Split(userARN, ":")[4]
arn := fmt.Sprintf("arn:aws:elasticache:%s:%s:cluster:%s", region, accountID, d.Id()) arn := fmt.Sprintf("arn:aws:elasticache:%s:%s:cluster:%s", region, accountID, d.Id())
return arn, nil return arn, nil

4
builtin/providers/aws/resource_aws_elasticache_cluster_test.go
View File

@ -57,7 +57,7 @@ func testAccCheckAWSElasticacheClusterDestroy(s *terraform.State) error {
continue continue
} }
res, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{ res, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{
CacheClusterID: aws.String(rs.Primary.ID), CacheClusterId: aws.String(rs.Primary.ID),
}) })
if err != nil { if err != nil {
return err return err
@ -82,7 +82,7 @@ func testAccCheckAWSElasticacheClusterExists(n string) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).elasticacheconn conn := testAccProvider.Meta().(*AWSClient).elasticacheconn
_, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{ _, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{
CacheClusterID: aws.String(rs.Primary.ID), CacheClusterId: aws.String(rs.Primary.ID),
}) })
if err != nil { if err != nil {
return fmt.Errorf("Elasticache error: %v", err) return fmt.Errorf("Elasticache error: %v", err)

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

@ -69,7 +69,7 @@ func resourceAwsElasticacheSecurityGroupCreate(d *schema.ResourceData, meta inte
_, err = conn.AuthorizeCacheSecurityGroupIngress(&elasticache.AuthorizeCacheSecurityGroupIngressInput{ _, err = conn.AuthorizeCacheSecurityGroupIngress(&elasticache.AuthorizeCacheSecurityGroupIngressInput{
CacheSecurityGroupName: aws.String(name), CacheSecurityGroupName: aws.String(name),
EC2SecurityGroupName: aws.String(n), EC2SecurityGroupName: aws.String(n),
EC2SecurityGroupOwnerID: aws.String(*res.CacheSecurityGroup.OwnerID), EC2SecurityGroupOwnerId: aws.String(*res.CacheSecurityGroup.OwnerId),
}) })
if err != nil { if err != nil {
log.Printf("[ERROR] Failed to authorize: %v", err) log.Printf("[ERROR] Failed to authorize: %v", err)

4
builtin/providers/aws/resource_aws_elasticache_subnet_group.go
View File

@ -57,7 +57,7 @@ func resourceAwsElasticacheSubnetGroupCreate(d *schema.ResourceData, meta interf
req := &elasticache.CreateCacheSubnetGroupInput{ req := &elasticache.CreateCacheSubnetGroupInput{
CacheSubnetGroupDescription: aws.String(desc), CacheSubnetGroupDescription: aws.String(desc),
CacheSubnetGroupName: aws.String(name), CacheSubnetGroupName: aws.String(name),
SubnetIDs: subnetIds, SubnetIds: subnetIds,
} }
_, err := conn.CreateCacheSubnetGroup(req) _, err := conn.CreateCacheSubnetGroup(req)
@ -122,7 +122,7 @@ func resourceAwsElasticacheSubnetGroupUpdate(d *schema.ResourceData, meta interf
_, err := conn.ModifyCacheSubnetGroup(&elasticache.ModifyCacheSubnetGroupInput{ _, err := conn.ModifyCacheSubnetGroup(&elasticache.ModifyCacheSubnetGroupInput{
CacheSubnetGroupName: aws.String(d.Get("name").(string)), CacheSubnetGroupName: aws.String(d.Get("name").(string)),
CacheSubnetGroupDescription: aws.String(d.Get("description").(string)), CacheSubnetGroupDescription: aws.String(d.Get("description").(string)),
SubnetIDs: subnets, SubnetIds: subnets,
}) })
if err != nil { if err != nil {
return err return err

14
builtin/providers/aws/resource_aws_flow_log.go
View File

@ -85,9 +85,9 @@ func resourceAwsLogFlowCreate(d *schema.ResourceData, meta interface{}) error {
} }
opts := &ec2.CreateFlowLogsInput{ opts := &ec2.CreateFlowLogsInput{
DeliverLogsPermissionARN: aws.String(d.Get("iam_role_arn").(string)), DeliverLogsPermissionArn: aws.String(d.Get("iam_role_arn").(string)),
LogGroupName: aws.String(d.Get("log_group_name").(string)), LogGroupName: aws.String(d.Get("log_group_name").(string)),
ResourceIDs: []*string{aws.String(resourceId)}, ResourceIds: []*string{aws.String(resourceId)},
ResourceType: aws.String(resourceType), ResourceType: aws.String(resourceType),
TrafficType: aws.String(d.Get("traffic_type").(string)), TrafficType: aws.String(d.Get("traffic_type").(string)),
} }
@ -99,11 +99,11 @@ func resourceAwsLogFlowCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating Flow Log for (%s), error: %s", resourceId, err) return fmt.Errorf("Error creating Flow Log for (%s), error: %s", resourceId, err)
} }
if len(resp.FlowLogIDs) > 1 { if len(resp.FlowLogIds) > 1 {
return fmt.Errorf("Error: multiple Flow Logs created for (%s)", resourceId) return fmt.Errorf("Error: multiple Flow Logs created for (%s)", resourceId)
} }
d.SetId(*resp.FlowLogIDs[0]) d.SetId(*resp.FlowLogIds[0])
return resourceAwsLogFlowRead(d, meta) return resourceAwsLogFlowRead(d, meta)
} }
@ -112,7 +112,7 @@ func resourceAwsLogFlowRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
opts := &ec2.DescribeFlowLogsInput{ opts := &ec2.DescribeFlowLogsInput{
FlowLogIDs: []*string{aws.String(d.Id())}, FlowLogIds: []*string{aws.String(d.Id())},
} }
resp, err := conn.DescribeFlowLogs(opts) resp, err := conn.DescribeFlowLogs(opts)
@ -132,7 +132,7 @@ func resourceAwsLogFlowRead(d *schema.ResourceData, meta interface{}) error {
d.Set("traffic_type", fl.TrafficType) d.Set("traffic_type", fl.TrafficType)
d.Set("log_group_name", fl.LogGroupName) d.Set("log_group_name", fl.LogGroupName)
d.Set("iam_role_arn", fl.DeliverLogsPermissionARN) d.Set("iam_role_arn", fl.DeliverLogsPermissionArn)
return nil return nil
} }
@ -143,7 +143,7 @@ func resourceAwsLogFlowDelete(d *schema.ResourceData, meta interface{}) error {
log.Printf( log.Printf(
"[DEBUG] Flow Log Destroy: %s", d.Id()) "[DEBUG] Flow Log Destroy: %s", d.Id())
_, err := conn.DeleteFlowLogs(&ec2.DeleteFlowLogsInput{ _, err := conn.DeleteFlowLogs(&ec2.DeleteFlowLogsInput{
FlowLogIDs: []*string{aws.String(d.Id())}, FlowLogIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {

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

@ -64,7 +64,7 @@ func testAccCheckFlowLogExists(n string, flowLog *ec2.FlowLog) resource.TestChec
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
describeOpts := &ec2.DescribeFlowLogsInput{ describeOpts := &ec2.DescribeFlowLogsInput{
FlowLogIDs: []*string{aws.String(rs.Primary.ID)}, FlowLogIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeFlowLogs(describeOpts) resp, err := conn.DescribeFlowLogs(describeOpts)
if err != nil { if err != nil {

8
builtin/providers/aws/resource_aws_iam_access_key.go
View File

@ -56,7 +56,7 @@ func resourceAwsIamAccessKeyCreate(d *schema.ResourceData, meta interface{}) err
return err return err
} }
return resourceAwsIamAccessKeyReadResult(d, &iam.AccessKeyMetadata{ return resourceAwsIamAccessKeyReadResult(d, &iam.AccessKeyMetadata{
AccessKeyID: createResp.AccessKey.AccessKeyID, AccessKeyId: createResp.AccessKey.AccessKeyId,
CreateDate: createResp.AccessKey.CreateDate, CreateDate: createResp.AccessKey.CreateDate,
Status: createResp.AccessKey.Status, Status: createResp.AccessKey.Status,
UserName: createResp.AccessKey.UserName, UserName: createResp.AccessKey.UserName,
@ -81,7 +81,7 @@ func resourceAwsIamAccessKeyRead(d *schema.ResourceData, meta interface{}) error
} }
for _, key := range getResp.AccessKeyMetadata { for _, key := range getResp.AccessKeyMetadata {
if key.AccessKeyID != nil && *key.AccessKeyID == d.Id() { if key.AccessKeyId != nil && *key.AccessKeyId == d.Id() {
return resourceAwsIamAccessKeyReadResult(d, key) return resourceAwsIamAccessKeyReadResult(d, key)
} }
} }
@ -92,7 +92,7 @@ func resourceAwsIamAccessKeyRead(d *schema.ResourceData, meta interface{}) error
} }
func resourceAwsIamAccessKeyReadResult(d *schema.ResourceData, key *iam.AccessKeyMetadata) error { func resourceAwsIamAccessKeyReadResult(d *schema.ResourceData, key *iam.AccessKeyMetadata) error {
d.SetId(*key.AccessKeyID) d.SetId(*key.AccessKeyId)
if err := d.Set("user", key.UserName); err != nil { if err := d.Set("user", key.UserName); err != nil {
return err return err
} }
@ -106,7 +106,7 @@ func resourceAwsIamAccessKeyDelete(d *schema.ResourceData, meta interface{}) err
iamconn := meta.(*AWSClient).iamconn iamconn := meta.(*AWSClient).iamconn
request := &iam.DeleteAccessKeyInput{ request := &iam.DeleteAccessKeyInput{
AccessKeyID: aws.String(d.Id()), AccessKeyId: aws.String(d.Id()),
UserName: aws.String(d.Get("user").(string)), UserName: aws.String(d.Get("user").(string)),
} }

4
builtin/providers/aws/resource_aws_iam_group.go
View File

@ -81,13 +81,13 @@ func resourceAwsIamGroupReadResult(d *schema.ResourceData, group *iam.Group) err
if err := d.Set("name", group.GroupName); err != nil { if err := d.Set("name", group.GroupName); err != nil {
return err return err
} }
if err := d.Set("arn", group.ARN); err != nil { if err := d.Set("arn", group.Arn); err != nil {
return err return err
} }
if err := d.Set("path", group.Path); err != nil { if err := d.Set("path", group.Path); err != nil {
return err return err
} }
if err := d.Set("unique_id", group.GroupID); err != nil { if err := d.Set("unique_id", group.GroupId); err != nil {
return err return err
} }
return nil return nil

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

@ -205,7 +205,7 @@ func instanceProfileReadResult(d *schema.ResourceData, result *iam.InstanceProfi
if err := d.Set("name", result.InstanceProfileName); err != nil { if err := d.Set("name", result.InstanceProfileName); err != nil {
return err return err
} }
if err := d.Set("arn", result.ARN); err != nil { if err := d.Set("arn", result.Arn); err != nil {
return err return err
} }
if err := d.Set("path", result.Path); err != nil { if err := d.Set("path", result.Path); err != nil {

20
builtin/providers/aws/resource_aws_iam_policy.go
View File

@ -69,7 +69,7 @@ func resourceAwsIamPolicyRead(d *schema.ResourceData, meta interface{}) error {
iamconn := meta.(*AWSClient).iamconn iamconn := meta.(*AWSClient).iamconn
request := &iam.GetPolicyInput{ request := &iam.GetPolicyInput{
PolicyARN: aws.String(d.Id()), PolicyArn: aws.String(d.Id()),
} }
response, err := iamconn.GetPolicy(request) response, err := iamconn.GetPolicy(request)
@ -95,7 +95,7 @@ func resourceAwsIamPolicyUpdate(d *schema.ResourceData, meta interface{}) error
return nil return nil
} }
request := &iam.CreatePolicyVersionInput{ request := &iam.CreatePolicyVersionInput{
PolicyARN: aws.String(d.Id()), PolicyArn: aws.String(d.Id()),
PolicyDocument: aws.String(d.Get("policy").(string)), PolicyDocument: aws.String(d.Get("policy").(string)),
SetAsDefault: aws.Bool(true), SetAsDefault: aws.Bool(true),
} }
@ -114,7 +114,7 @@ func resourceAwsIamPolicyDelete(d *schema.ResourceData, meta interface{}) error
} }
request := &iam.DeletePolicyInput{ request := &iam.DeletePolicyInput{
PolicyARN: aws.String(d.Id()), PolicyArn: aws.String(d.Id()),
} }
_, err := iamconn.DeletePolicy(request) _, err := iamconn.DeletePolicy(request)
@ -155,7 +155,7 @@ func iamPolicyPruneVersions(arn string, iamconn *iam.IAM) error {
} }
} }
if err := iamPolicyDeleteVersion(arn, *oldestVersion.VersionID, iamconn); err != nil { if err := iamPolicyDeleteVersion(arn, *oldestVersion.VersionId, iamconn); err != nil {
return err return err
} }
return nil return nil
@ -171,7 +171,7 @@ func iamPolicyDeleteNondefaultVersions(arn string, iamconn *iam.IAM) error {
if *version.IsDefaultVersion { if *version.IsDefaultVersion {
continue continue
} }
if err := iamPolicyDeleteVersion(arn, *version.VersionID, iamconn); err != nil { if err := iamPolicyDeleteVersion(arn, *version.VersionId, iamconn); err != nil {
return err return err
} }
} }
@ -181,8 +181,8 @@ func iamPolicyDeleteNondefaultVersions(arn string, iamconn *iam.IAM) error {
func iamPolicyDeleteVersion(arn, versionID string, iamconn *iam.IAM) error { func iamPolicyDeleteVersion(arn, versionID string, iamconn *iam.IAM) error {
request := &iam.DeletePolicyVersionInput{ request := &iam.DeletePolicyVersionInput{
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
VersionID: aws.String(versionID), VersionId: aws.String(versionID),
} }
_, err := iamconn.DeletePolicyVersion(request) _, err := iamconn.DeletePolicyVersion(request)
@ -194,7 +194,7 @@ func iamPolicyDeleteVersion(arn, versionID string, iamconn *iam.IAM) error {
func iamPolicyListVersions(arn string, iamconn *iam.IAM) ([]*iam.PolicyVersion, error) { func iamPolicyListVersions(arn string, iamconn *iam.IAM) ([]*iam.PolicyVersion, error) {
request := &iam.ListPolicyVersionsInput{ request := &iam.ListPolicyVersionsInput{
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
} }
response, err := iamconn.ListPolicyVersions(request) response, err := iamconn.ListPolicyVersions(request)
@ -205,7 +205,7 @@ func iamPolicyListVersions(arn string, iamconn *iam.IAM) ([]*iam.PolicyVersion,
} }
func readIamPolicy(d *schema.ResourceData, policy *iam.Policy) error { func readIamPolicy(d *schema.ResourceData, policy *iam.Policy) error {
d.SetId(*policy.ARN) d.SetId(*policy.Arn)
if policy.Description != nil { if policy.Description != nil {
// the description isn't present in the response to CreatePolicy. // the description isn't present in the response to CreatePolicy.
if err := d.Set("description", *policy.Description); err != nil { if err := d.Set("description", *policy.Description); err != nil {
@ -218,7 +218,7 @@ func readIamPolicy(d *schema.ResourceData, policy *iam.Policy) error {
if err := d.Set("name", *policy.PolicyName); err != nil { if err := d.Set("name", *policy.PolicyName); err != nil {
return err return err
} }
if err := d.Set("arn", *policy.ARN); err != nil { if err := d.Set("arn", *policy.Arn); err != nil {
return err return err
} }
// TODO: set policy // TODO: set policy

16
builtin/providers/aws/resource_aws_iam_policy_attachment.go
View File

@ -85,7 +85,7 @@ func resourceAwsIamPolicyAttachmentRead(d *schema.ResourceData, meta interface{}
name := d.Get("name").(string) name := d.Get("name").(string)
_, err := conn.GetPolicy(&iam.GetPolicyInput{ _, err := conn.GetPolicy(&iam.GetPolicyInput{
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
@ -99,7 +99,7 @@ func resourceAwsIamPolicyAttachmentRead(d *schema.ResourceData, meta interface{}
} }
policyEntities, err := conn.ListEntitiesForPolicy(&iam.ListEntitiesForPolicyInput{ policyEntities, err := conn.ListEntitiesForPolicy(&iam.ListEntitiesForPolicyInput{
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
@ -191,7 +191,7 @@ func attachPolicyToUsers(conn *iam.IAM, users []*string, arn string) error {
for _, u := range users { for _, u := range users {
_, err := conn.AttachUserPolicy(&iam.AttachUserPolicyInput{ _, err := conn.AttachUserPolicy(&iam.AttachUserPolicyInput{
UserName: u, UserName: u,
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return err return err
@ -203,7 +203,7 @@ func attachPolicyToRoles(conn *iam.IAM, roles []*string, arn string) error {
for _, r := range roles { for _, r := range roles {
_, err := conn.AttachRolePolicy(&iam.AttachRolePolicyInput{ _, err := conn.AttachRolePolicy(&iam.AttachRolePolicyInput{
RoleName: r, RoleName: r,
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return err return err
@ -215,7 +215,7 @@ func attachPolicyToGroups(conn *iam.IAM, groups []*string, arn string) error {
for _, g := range groups { for _, g := range groups {
_, err := conn.AttachGroupPolicy(&iam.AttachGroupPolicyInput{ _, err := conn.AttachGroupPolicy(&iam.AttachGroupPolicyInput{
GroupName: g, GroupName: g,
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return err return err
@ -294,7 +294,7 @@ func detachPolicyFromUsers(conn *iam.IAM, users []*string, arn string) error {
for _, u := range users { for _, u := range users {
_, err := conn.DetachUserPolicy(&iam.DetachUserPolicyInput{ _, err := conn.DetachUserPolicy(&iam.DetachUserPolicyInput{
UserName: u, UserName: u,
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return err return err
@ -306,7 +306,7 @@ func detachPolicyFromRoles(conn *iam.IAM, roles []*string, arn string) error {
for _, r := range roles { for _, r := range roles {
_, err := conn.DetachRolePolicy(&iam.DetachRolePolicyInput{ _, err := conn.DetachRolePolicy(&iam.DetachRolePolicyInput{
RoleName: r, RoleName: r,
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return err return err
@ -318,7 +318,7 @@ func detachPolicyFromGroups(conn *iam.IAM, groups []*string, arn string) error {
for _, g := range groups { for _, g := range groups {
_, err := conn.DetachGroupPolicy(&iam.DetachGroupPolicyInput{ _, err := conn.DetachGroupPolicy(&iam.DetachGroupPolicyInput{
GroupName: g, GroupName: g,
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return err return err

4
builtin/providers/aws/resource_aws_iam_policy_attachment_test.go
View File

@ -55,7 +55,7 @@ func testAccCheckAWSPolicyAttachmentExists(n string, c int64, out *iam.ListEntit
arn := rs.Primary.Attributes["policy_arn"] arn := rs.Primary.Attributes["policy_arn"]
resp, err := conn.GetPolicy(&iam.GetPolicyInput{ resp, err := conn.GetPolicy(&iam.GetPolicyInput{
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return fmt.Errorf("Error: Policy (%s) not found", n) return fmt.Errorf("Error: Policy (%s) not found", n)
@ -64,7 +64,7 @@ func testAccCheckAWSPolicyAttachmentExists(n string, c int64, out *iam.ListEntit
return fmt.Errorf("Error: Policy (%s) has wrong number of entities attached on initial creation", n) return fmt.Errorf("Error: Policy (%s) has wrong number of entities attached on initial creation", n)
} }
resp2, err := conn.ListEntitiesForPolicy(&iam.ListEntitiesForPolicyInput{ resp2, err := conn.ListEntitiesForPolicy(&iam.ListEntitiesForPolicyInput{
PolicyARN: aws.String(arn), PolicyArn: aws.String(arn),
}) })
if err != nil { if err != nil {
return fmt.Errorf("Error: Failed to get entities for Policy (%s)", arn) return fmt.Errorf("Error: Failed to get entities for Policy (%s)", arn)

4
builtin/providers/aws/resource_aws_iam_role.go
View File

@ -101,13 +101,13 @@ func resourceAwsIamRoleReadResult(d *schema.ResourceData, role *iam.Role) error
if err := d.Set("name", role.RoleName); err != nil { if err := d.Set("name", role.RoleName); err != nil {
return err return err
} }
if err := d.Set("arn", role.ARN); err != nil { if err := d.Set("arn", role.Arn); err != nil {
return err return err
} }
if err := d.Set("path", role.Path); err != nil { if err := d.Set("path", role.Path); err != nil {
return err return err
} }
if err := d.Set("unique_id", role.RoleID); err != nil { if err := d.Set("unique_id", role.RoleId); err != nil {
return err return err
} }
return nil return nil

4
builtin/providers/aws/resource_aws_iam_server_certificate.go
View File

@ -89,7 +89,7 @@ func resourceAwsIAMServerCertificateCreate(d *schema.ResourceData, meta interfac
return fmt.Errorf("[WARN] Error uploading server certificate, error: %s", err) return fmt.Errorf("[WARN] Error uploading server certificate, error: %s", err)
} }
d.SetId(*resp.ServerCertificateMetadata.ServerCertificateID) d.SetId(*resp.ServerCertificateMetadata.ServerCertificateId)
return resourceAwsIAMServerCertificateRead(d, meta) return resourceAwsIAMServerCertificateRead(d, meta)
} }
@ -117,7 +117,7 @@ func resourceAwsIAMServerCertificateRead(d *schema.ResourceData, meta interface{
} }
d.Set("path", resp.ServerCertificate.ServerCertificateMetadata.Path) d.Set("path", resp.ServerCertificate.ServerCertificateMetadata.Path)
d.Set("arn", resp.ServerCertificate.ServerCertificateMetadata.ARN) d.Set("arn", resp.ServerCertificate.ServerCertificateMetadata.Arn)
return nil return nil
} }

4
builtin/providers/aws/resource_aws_iam_user.go
View File

@ -90,13 +90,13 @@ func resourceAwsIamUserReadResult(d *schema.ResourceData, user *iam.User) error
if err := d.Set("name", user.UserName); err != nil { if err := d.Set("name", user.UserName); err != nil {
return err return err
} }
if err := d.Set("arn", user.ARN); err != nil { if err := d.Set("arn", user.Arn); err != nil {
return err return err
} }
if err := d.Set("path", user.Path); err != nil { if err := d.Set("path", user.Path); err != nil {
return err return err
} }
if err := d.Set("unique_id", user.UserID); err != nil { if err := d.Set("unique_id", user.UserId); err != nil {
return err return err
} }
return nil return nil

116
builtin/providers/aws/resource_aws_instance.go
View File

@ -326,21 +326,21 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
// Build the creation struct // Build the creation struct
runOpts := &ec2.RunInstancesInput{ runOpts := &ec2.RunInstancesInput{
BlockDeviceMappings: instanceOpts.BlockDeviceMappings, BlockDeviceMappings: instanceOpts.BlockDeviceMappings,
DisableAPITermination: instanceOpts.DisableAPITermination, DisableApiTermination: instanceOpts.DisableAPITermination,
EBSOptimized: instanceOpts.EBSOptimized, EbsOptimized: instanceOpts.EBSOptimized,
Monitoring: instanceOpts.Monitoring, Monitoring: instanceOpts.Monitoring,
IAMInstanceProfile: instanceOpts.IAMInstanceProfile, IamInstanceProfile: instanceOpts.IAMInstanceProfile,
ImageID: instanceOpts.ImageID, ImageId: instanceOpts.ImageID,
InstanceType: instanceOpts.InstanceType, InstanceType: instanceOpts.InstanceType,
KeyName: instanceOpts.KeyName, KeyName: instanceOpts.KeyName,
MaxCount: aws.Int64(int64(1)), MaxCount: aws.Int64(int64(1)),
MinCount: aws.Int64(int64(1)), MinCount: aws.Int64(int64(1)),
NetworkInterfaces: instanceOpts.NetworkInterfaces, NetworkInterfaces: instanceOpts.NetworkInterfaces,
Placement: instanceOpts.Placement, Placement: instanceOpts.Placement,
PrivateIPAddress: instanceOpts.PrivateIPAddress, PrivateIpAddress: instanceOpts.PrivateIPAddress,
SecurityGroupIDs: instanceOpts.SecurityGroupIDs, SecurityGroupIds: instanceOpts.SecurityGroupIDs,
SecurityGroups: instanceOpts.SecurityGroups, SecurityGroups: instanceOpts.SecurityGroups,
SubnetID: instanceOpts.SubnetID, SubnetId: instanceOpts.SubnetID,
UserData: instanceOpts.UserData64, UserData: instanceOpts.UserData64,
} }
@ -366,21 +366,21 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
} }
instance := runResp.Instances[0] instance := runResp.Instances[0]
log.Printf("[INFO] Instance ID: %s", *instance.InstanceID) log.Printf("[INFO] Instance ID: %s", *instance.InstanceId)
// Store the resulting ID so we can look this up later // Store the resulting ID so we can look this up later
d.SetId(*instance.InstanceID) d.SetId(*instance.InstanceId)
// Wait for the instance to become running so we can get some attributes // Wait for the instance to become running so we can get some attributes
// that aren't available until later. // that aren't available until later.
log.Printf( log.Printf(
"[DEBUG] Waiting for instance (%s) to become running", "[DEBUG] Waiting for instance (%s) to become running",
*instance.InstanceID) *instance.InstanceId)
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"pending"}, Pending: []string{"pending"},
Target: "running", Target: "running",
Refresh: InstanceStateRefreshFunc(conn, *instance.InstanceID), Refresh: InstanceStateRefreshFunc(conn, *instance.InstanceId),
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
@ -390,21 +390,21 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf(
"Error waiting for instance (%s) to become ready: %s", "Error waiting for instance (%s) to become ready: %s",
*instance.InstanceID, err) *instance.InstanceId, err)
} }
instance = instanceRaw.(*ec2.Instance) instance = instanceRaw.(*ec2.Instance)
// Initialize the connection info // Initialize the connection info
if instance.PublicIPAddress != nil { if instance.PublicIpAddress != nil {
d.SetConnInfo(map[string]string{ d.SetConnInfo(map[string]string{
"type": "ssh", "type": "ssh",
"host": *instance.PublicIPAddress, "host": *instance.PublicIpAddress,
}) })
} else if instance.PrivateIPAddress != nil { } else if instance.PrivateIpAddress != nil {
d.SetConnInfo(map[string]string{ d.SetConnInfo(map[string]string{
"type": "ssh", "type": "ssh",
"host": *instance.PrivateIPAddress, "host": *instance.PrivateIpAddress,
}) })
} }
@ -421,7 +421,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{
InstanceIDs: []*string{aws.String(d.Id())}, InstanceIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
// If the instance was not found, return nil so that we can show // If the instance was not found, return nil so that we can show
@ -456,19 +456,19 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
d.Set("tenancy", instance.Placement.Tenancy) d.Set("tenancy", instance.Placement.Tenancy)
} }
d.Set("ami", instance.ImageID) d.Set("ami", instance.ImageId)
d.Set("instance_type", instance.InstanceType) d.Set("instance_type", instance.InstanceType)
d.Set("key_name", instance.KeyName) d.Set("key_name", instance.KeyName)
d.Set("public_dns", instance.PublicDNSName) d.Set("public_dns", instance.PublicDnsName)
d.Set("public_ip", instance.PublicIPAddress) d.Set("public_ip", instance.PublicIpAddress)
d.Set("private_dns", instance.PrivateDNSName) d.Set("private_dns", instance.PrivateDnsName)
d.Set("private_ip", instance.PrivateIPAddress) d.Set("private_ip", instance.PrivateIpAddress)
if len(instance.NetworkInterfaces) > 0 { if len(instance.NetworkInterfaces) > 0 {
d.Set("subnet_id", instance.NetworkInterfaces[0].SubnetID) d.Set("subnet_id", instance.NetworkInterfaces[0].SubnetId)
} else { } else {
d.Set("subnet_id", instance.SubnetID) d.Set("subnet_id", instance.SubnetId)
} }
d.Set("ebs_optimized", instance.EBSOptimized) d.Set("ebs_optimized", instance.EbsOptimized)
if instance.Monitoring != nil && instance.Monitoring.State != nil { if instance.Monitoring != nil && instance.Monitoring.State != nil {
monitoringState := *instance.Monitoring.State monitoringState := *instance.Monitoring.State
@ -482,7 +482,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
// we use IDs if we're in a VPC. However, if we previously had an // we use IDs if we're in a VPC. However, if we previously had an
// all-name list of security groups, we use names. Or, if we had any // all-name list of security groups, we use names. Or, if we had any
// IDs, we use IDs. // IDs, we use IDs.
useID := instance.SubnetID != nil && *instance.SubnetID != "" useID := instance.SubnetId != nil && *instance.SubnetId != ""
if v := d.Get("security_groups"); v != nil { if v := d.Get("security_groups"); v != nil {
match := useID match := useID
sgs := v.(*schema.Set).List() sgs := v.(*schema.Set).List()
@ -503,7 +503,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
sgs := make([]string, 0, len(instance.SecurityGroups)) sgs := make([]string, 0, len(instance.SecurityGroups))
if useID { if useID {
for _, sg := range instance.SecurityGroups { for _, sg := range instance.SecurityGroups {
sgs = append(sgs, *sg.GroupID) sgs = append(sgs, *sg.GroupId)
} }
log.Printf("[DEBUG] Setting Security Group IDs: %#v", sgs) log.Printf("[DEBUG] Setting Security Group IDs: %#v", sgs)
if err := d.Set("vpc_security_group_ids", sgs); err != nil { if err := d.Set("vpc_security_group_ids", sgs); err != nil {
@ -540,7 +540,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
if d.Get("subnet_id").(string) != "" { if d.Get("subnet_id").(string) != "" {
log.Printf("[INFO] Modifying instance %s", d.Id()) log.Printf("[INFO] Modifying instance %s", d.Id())
_, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{ _, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{
InstanceID: aws.String(d.Id()), InstanceId: aws.String(d.Id()),
SourceDestCheck: &ec2.AttributeBooleanValue{ SourceDestCheck: &ec2.AttributeBooleanValue{
Value: aws.Bool(d.Get("source_dest_check").(bool)), Value: aws.Bool(d.Get("source_dest_check").(bool)),
}, },
@ -558,7 +558,7 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
} }
} }
_, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{ _, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{
InstanceID: aws.String(d.Id()), InstanceId: aws.String(d.Id()),
Groups: groups, Groups: groups,
}) })
if err != nil { if err != nil {
@ -568,8 +568,8 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("disable_api_termination") { if d.HasChange("disable_api_termination") {
_, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{ _, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{
InstanceID: aws.String(d.Id()), InstanceId: aws.String(d.Id()),
DisableAPITermination: &ec2.AttributeBooleanValue{ DisableApiTermination: &ec2.AttributeBooleanValue{
Value: aws.Bool(d.Get("disable_api_termination").(bool)), Value: aws.Bool(d.Get("disable_api_termination").(bool)),
}, },
}) })
@ -583,12 +583,12 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
if d.Get("monitoring").(bool) { if d.Get("monitoring").(bool) {
log.Printf("[DEBUG] Enabling monitoring for Instance (%s)", d.Id()) log.Printf("[DEBUG] Enabling monitoring for Instance (%s)", d.Id())
_, mErr = conn.MonitorInstances(&ec2.MonitorInstancesInput{ _, mErr = conn.MonitorInstances(&ec2.MonitorInstancesInput{
InstanceIDs: []*string{aws.String(d.Id())}, InstanceIds: []*string{aws.String(d.Id())},
}) })
} else { } else {
log.Printf("[DEBUG] Disabling monitoring for Instance (%s)", d.Id()) log.Printf("[DEBUG] Disabling monitoring for Instance (%s)", d.Id())
_, mErr = conn.UnmonitorInstances(&ec2.UnmonitorInstancesInput{ _, mErr = conn.UnmonitorInstances(&ec2.UnmonitorInstancesInput{
InstanceIDs: []*string{aws.String(d.Id())}, InstanceIds: []*string{aws.String(d.Id())},
}) })
} }
if mErr != nil { if mErr != nil {
@ -620,7 +620,7 @@ func resourceAwsInstanceDelete(d *schema.ResourceData, meta interface{}) error {
func InstanceStateRefreshFunc(conn *ec2.EC2, instanceID string) resource.StateRefreshFunc { func InstanceStateRefreshFunc(conn *ec2.EC2, instanceID string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{
InstanceIDs: []*string{aws.String(instanceID)}, InstanceIds: []*string{aws.String(instanceID)},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" {
@ -668,8 +668,8 @@ func readBlockDevicesFromInstance(instance *ec2.Instance, conn *ec2.EC2) (map[st
instanceBlockDevices := make(map[string]*ec2.InstanceBlockDeviceMapping) instanceBlockDevices := make(map[string]*ec2.InstanceBlockDeviceMapping)
for _, bd := range instance.BlockDeviceMappings { for _, bd := range instance.BlockDeviceMappings {
if bd.EBS != nil { if bd.Ebs != nil {
instanceBlockDevices[*(bd.EBS.VolumeID)] = bd instanceBlockDevices[*(bd.Ebs.VolumeId)] = bd
} }
} }
@ -685,18 +685,18 @@ func readBlockDevicesFromInstance(instance *ec2.Instance, conn *ec2.EC2) (map[st
// Need to call DescribeVolumes to get volume_size and volume_type for each // Need to call DescribeVolumes to get volume_size and volume_type for each
// EBS block device // EBS block device
volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{ volResp, err := conn.DescribeVolumes(&ec2.DescribeVolumesInput{
VolumeIDs: volIDs, VolumeIds: volIDs,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, vol := range volResp.Volumes { for _, vol := range volResp.Volumes {
instanceBd := instanceBlockDevices[*vol.VolumeID] instanceBd := instanceBlockDevices[*vol.VolumeId]
bd := make(map[string]interface{}) bd := make(map[string]interface{})
if instanceBd.EBS != nil && instanceBd.EBS.DeleteOnTermination != nil { if instanceBd.Ebs != nil && instanceBd.Ebs.DeleteOnTermination != nil {
bd["delete_on_termination"] = *instanceBd.EBS.DeleteOnTermination bd["delete_on_termination"] = *instanceBd.Ebs.DeleteOnTermination
} }
if vol.Size != nil { if vol.Size != nil {
bd["volume_size"] = *vol.Size bd["volume_size"] = *vol.Size
@ -704,8 +704,8 @@ func readBlockDevicesFromInstance(instance *ec2.Instance, conn *ec2.EC2) (map[st
if vol.VolumeType != nil { if vol.VolumeType != nil {
bd["volume_type"] = *vol.VolumeType bd["volume_type"] = *vol.VolumeType
} }
if vol.IOPS != nil { if vol.Iops != nil {
bd["iops"] = *vol.IOPS bd["iops"] = *vol.Iops
} }
if blockDeviceIsRoot(instanceBd, instance) { if blockDeviceIsRoot(instanceBd, instance) {
@ -717,8 +717,8 @@ func readBlockDevicesFromInstance(instance *ec2.Instance, conn *ec2.EC2) (map[st
if vol.Encrypted != nil { if vol.Encrypted != nil {
bd["encrypted"] = *vol.Encrypted bd["encrypted"] = *vol.Encrypted
} }
if vol.SnapshotID != nil { if vol.SnapshotId != nil {
bd["snapshot_id"] = *vol.SnapshotID bd["snapshot_id"] = *vol.SnapshotId
} }
blockDevices["ebs"] = append(blockDevices["ebs"].([]map[string]interface{}), bd) blockDevices["ebs"] = append(blockDevices["ebs"].([]map[string]interface{}), bd)
@ -741,7 +741,7 @@ func fetchRootDeviceName(ami string, conn *ec2.EC2) (*string, error) {
log.Printf("[DEBUG] Describing AMI %q to get root block device name", ami) log.Printf("[DEBUG] Describing AMI %q to get root block device name", ami)
res, err := conn.DescribeImages(&ec2.DescribeImagesInput{ res, err := conn.DescribeImages(&ec2.DescribeImagesInput{
ImageIDs: []*string{aws.String(ami)}, ImageIds: []*string{aws.String(ami)},
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@ -792,12 +792,12 @@ func readBlockDeviceMappingsFromConfig(
vL := v.(*schema.Set).List() vL := v.(*schema.Set).List()
for _, v := range vL { for _, v := range vL {
bd := v.(map[string]interface{}) bd := v.(map[string]interface{})
ebs := &ec2.EBSBlockDevice{ ebs := &ec2.EbsBlockDevice{
DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)), DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)),
} }
if v, ok := bd["snapshot_id"].(string); ok && v != "" { if v, ok := bd["snapshot_id"].(string); ok && v != "" {
ebs.SnapshotID = aws.String(v) ebs.SnapshotId = aws.String(v)
} }
if v, ok := bd["encrypted"].(bool); ok && v { if v, ok := bd["encrypted"].(bool); ok && v {
@ -813,12 +813,12 @@ func readBlockDeviceMappingsFromConfig(
} }
if v, ok := bd["iops"].(int); ok && v > 0 { if v, ok := bd["iops"].(int); ok && v > 0 {
ebs.IOPS = aws.Int64(int64(v)) ebs.Iops = aws.Int64(int64(v))
} }
blockDevices = append(blockDevices, &ec2.BlockDeviceMapping{ blockDevices = append(blockDevices, &ec2.BlockDeviceMapping{
DeviceName: aws.String(bd["device_name"].(string)), DeviceName: aws.String(bd["device_name"].(string)),
EBS: ebs, Ebs: ebs,
}) })
} }
} }
@ -841,7 +841,7 @@ func readBlockDeviceMappingsFromConfig(
} }
for _, v := range vL { for _, v := range vL {
bd := v.(map[string]interface{}) bd := v.(map[string]interface{})
ebs := &ec2.EBSBlockDevice{ ebs := &ec2.EbsBlockDevice{
DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)), DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)),
} }
@ -854,7 +854,7 @@ func readBlockDeviceMappingsFromConfig(
} }
if v, ok := bd["iops"].(int); ok && v > 0 { if v, ok := bd["iops"].(int); ok && v > 0 {
ebs.IOPS = aws.Int64(int64(v)) ebs.Iops = aws.Int64(int64(v))
} }
if dn, err := fetchRootDeviceName(d.Get("ami").(string), conn); err == nil { if dn, err := fetchRootDeviceName(d.Get("ami").(string), conn); err == nil {
@ -866,7 +866,7 @@ func readBlockDeviceMappingsFromConfig(
blockDevices = append(blockDevices, &ec2.BlockDeviceMapping{ blockDevices = append(blockDevices, &ec2.BlockDeviceMapping{
DeviceName: dn, DeviceName: dn,
EBS: ebs, Ebs: ebs,
}) })
} else { } else {
return nil, err return nil, err
@ -882,7 +882,7 @@ type awsInstanceOpts struct {
DisableAPITermination *bool DisableAPITermination *bool
EBSOptimized *bool EBSOptimized *bool
Monitoring *ec2.RunInstancesMonitoringEnabled Monitoring *ec2.RunInstancesMonitoringEnabled
IAMInstanceProfile *ec2.IAMInstanceProfileSpecification IAMInstanceProfile *ec2.IamInstanceProfileSpecification
ImageID *string ImageID *string
InstanceType *string InstanceType *string
KeyName *string KeyName *string
@ -911,7 +911,7 @@ func buildAwsInstanceOpts(
Enabled: aws.Bool(d.Get("monitoring").(bool)), Enabled: aws.Bool(d.Get("monitoring").(bool)),
} }
opts.IAMInstanceProfile = &ec2.IAMInstanceProfileSpecification{ opts.IAMInstanceProfile = &ec2.IamInstanceProfileSpecification{
Name: aws.String(d.Get("iam_instance_profile").(string)), Name: aws.String(d.Get("iam_instance_profile").(string)),
} }
@ -964,14 +964,14 @@ func buildAwsInstanceOpts(
// to avoid: Network interfaces and an instance-level security groups may not be specified on // to avoid: Network interfaces and an instance-level security groups may not be specified on
// the same request // the same request
ni := &ec2.InstanceNetworkInterfaceSpecification{ ni := &ec2.InstanceNetworkInterfaceSpecification{
AssociatePublicIPAddress: aws.Bool(associatePublicIPAddress), AssociatePublicIpAddress: aws.Bool(associatePublicIPAddress),
DeviceIndex: aws.Int64(int64(0)), DeviceIndex: aws.Int64(int64(0)),
SubnetID: aws.String(subnetID), SubnetId: aws.String(subnetID),
Groups: groups, Groups: groups,
} }
if v, ok := d.GetOk("private_ip"); ok { if v, ok := d.GetOk("private_ip"); ok {
ni.PrivateIPAddress = aws.String(v.(string)) ni.PrivateIpAddress = aws.String(v.(string))
} }
if v := d.Get("vpc_security_group_ids").(*schema.Set); v.Len() > 0 { if v := d.Get("vpc_security_group_ids").(*schema.Set); v.Len() > 0 {
@ -1021,7 +1021,7 @@ func buildAwsInstanceOpts(
func awsTerminateInstance(conn *ec2.EC2, id string) error { func awsTerminateInstance(conn *ec2.EC2, id string) error {
log.Printf("[INFO] Terminating instance: %s", id) log.Printf("[INFO] Terminating instance: %s", id)
req := &ec2.TerminateInstancesInput{ req := &ec2.TerminateInstancesInput{
InstanceIDs: []*string{aws.String(id)}, InstanceIds: []*string{aws.String(id)},
} }
if _, err := conn.TerminateInstances(req); err != nil { if _, err := conn.TerminateInstances(req); err != nil {
return fmt.Errorf("Error terminating instance: %s", err) return fmt.Errorf("Error terminating instance: %s", err)

18
builtin/providers/aws/resource_aws_instance_test.go
View File

@ -90,7 +90,7 @@ func TestAccAWSInstance_basic(t *testing.T) {
Config: testAccInstanceConfig, Config: testAccInstanceConfig,
Check: func(*terraform.State) error { Check: func(*terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
_, err := conn.DeleteVolume(&ec2.DeleteVolumeInput{VolumeID: vol.VolumeID}) _, err := conn.DeleteVolume(&ec2.DeleteVolumeInput{VolumeId: vol.VolumeId})
return err return err
}, },
}, },
@ -237,13 +237,13 @@ func TestAccAWSInstance_disableApiTermination(t *testing.T) {
return func(*terraform.State) error { return func(*terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
r, err := conn.DescribeInstanceAttribute(&ec2.DescribeInstanceAttributeInput{ r, err := conn.DescribeInstanceAttribute(&ec2.DescribeInstanceAttributeInput{
InstanceID: v.InstanceID, InstanceId: v.InstanceId,
Attribute: aws.String("disableApiTermination"), Attribute: aws.String("disableApiTermination"),
}) })
if err != nil { if err != nil {
return err return err
} }
got := *r.DisableAPITermination.Value got := *r.DisableApiTermination.Value
if got != expected { if got != expected {
return fmt.Errorf("expected: %t, got: %t", expected, got) return fmt.Errorf("expected: %t, got: %t", expected, got)
} }
@ -403,8 +403,8 @@ func TestAccAWSInstance_privateIP(t *testing.T) {
testCheckPrivateIP := func() resource.TestCheckFunc { testCheckPrivateIP := func() resource.TestCheckFunc {
return func(*terraform.State) error { return func(*terraform.State) error {
if *v.PrivateIPAddress != "10.1.1.42" { if *v.PrivateIpAddress != "10.1.1.42" {
return fmt.Errorf("bad private IP: %s", *v.PrivateIPAddress) return fmt.Errorf("bad private IP: %s", *v.PrivateIpAddress)
} }
return nil return nil
@ -432,8 +432,8 @@ func TestAccAWSInstance_associatePublicIPAndPrivateIP(t *testing.T) {
testCheckPrivateIP := func() resource.TestCheckFunc { testCheckPrivateIP := func() resource.TestCheckFunc {
return func(*terraform.State) error { return func(*terraform.State) error {
if *v.PrivateIPAddress != "10.1.1.42" { if *v.PrivateIpAddress != "10.1.1.42" {
return fmt.Errorf("bad private IP: %s", *v.PrivateIPAddress) return fmt.Errorf("bad private IP: %s", *v.PrivateIpAddress)
} }
return nil return nil
@ -539,7 +539,7 @@ func testAccCheckInstanceDestroyWithProvider(s *terraform.State, provider *schem
// Try to find the resource // Try to find the resource
var err error var err error
resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{
InstanceIDs: []*string{aws.String(rs.Primary.ID)}, InstanceIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.Reservations) > 0 { if len(resp.Reservations) > 0 {
@ -585,7 +585,7 @@ func testAccCheckInstanceExistsWithProviders(n string, i *ec2.Instance, provider
conn := provider.Meta().(*AWSClient).ec2conn conn := provider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{ resp, err := conn.DescribeInstances(&ec2.DescribeInstancesInput{
InstanceIDs: []*string{aws.String(rs.Primary.ID)}, InstanceIds: []*string{aws.String(rs.Primary.ID)},
}) })
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidInstanceID.NotFound" {
continue continue

18
builtin/providers/aws/resource_aws_internet_gateway.go
View File

@ -42,7 +42,7 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{})
// Get the ID and store it // Get the ID and store it
ig := *resp.InternetGateway ig := *resp.InternetGateway
d.SetId(*ig.InternetGatewayID) d.SetId(*ig.InternetGatewayId)
log.Printf("[INFO] InternetGateway ID: %s", d.Id()) log.Printf("[INFO] InternetGateway ID: %s", d.Id())
err = setTags(conn, d) err = setTags(conn, d)
@ -72,7 +72,7 @@ func resourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) er
// Gateway exists but not attached to the VPC // Gateway exists but not attached to the VPC
d.Set("vpc_id", "") d.Set("vpc_id", "")
} else { } else {
d.Set("vpc_id", ig.Attachments[0].VPCID) d.Set("vpc_id", ig.Attachments[0].VpcId)
} }
d.Set("tags", tagsToMap(ig.Tags)) d.Set("tags", tagsToMap(ig.Tags))
@ -116,7 +116,7 @@ func resourceAwsInternetGatewayDelete(d *schema.ResourceData, meta interface{})
return resource.Retry(5*time.Minute, func() error { return resource.Retry(5*time.Minute, func() error {
_, err := conn.DeleteInternetGateway(&ec2.DeleteInternetGatewayInput{ _, err := conn.DeleteInternetGateway(&ec2.DeleteInternetGatewayInput{
InternetGatewayID: aws.String(d.Id()), InternetGatewayId: aws.String(d.Id()),
}) })
if err == nil { if err == nil {
return nil return nil
@ -154,8 +154,8 @@ func resourceAwsInternetGatewayAttach(d *schema.ResourceData, meta interface{})
d.Get("vpc_id").(string)) d.Get("vpc_id").(string))
_, err := conn.AttachInternetGateway(&ec2.AttachInternetGatewayInput{ _, err := conn.AttachInternetGateway(&ec2.AttachInternetGatewayInput{
InternetGatewayID: aws.String(d.Id()), InternetGatewayId: aws.String(d.Id()),
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
}) })
if err != nil { if err != nil {
return err return err
@ -224,8 +224,8 @@ func resourceAwsInternetGatewayDetach(d *schema.ResourceData, meta interface{})
func detachIGStateRefreshFunc(conn *ec2.EC2, instanceID, vpcID string) resource.StateRefreshFunc { func detachIGStateRefreshFunc(conn *ec2.EC2, instanceID, vpcID string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
_, err := conn.DetachInternetGateway(&ec2.DetachInternetGatewayInput{ _, err := conn.DetachInternetGateway(&ec2.DetachInternetGatewayInput{
InternetGatewayID: aws.String(instanceID), InternetGatewayId: aws.String(instanceID),
VPCID: aws.String(vpcID), VpcId: aws.String(vpcID),
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)
@ -250,7 +250,7 @@ func detachIGStateRefreshFunc(conn *ec2.EC2, instanceID, vpcID string) resource.
func IGStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func IGStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{ resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{
InternetGatewayIDs: []*string{aws.String(id)}, InternetGatewayIds: []*string{aws.String(id)},
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)
@ -283,7 +283,7 @@ func IGAttachStateRefreshFunc(conn *ec2.EC2, id string, expected string) resourc
} }
resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{ resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{
InternetGatewayIDs: []*string{aws.String(id)}, InternetGatewayIds: []*string{aws.String(id)},
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)

8
builtin/providers/aws/resource_aws_internet_gateway_test.go
View File

@ -22,8 +22,8 @@ func TestAccAWSInternetGateway_basic(t *testing.T) {
return fmt.Errorf("IG B is not attached") return fmt.Errorf("IG B is not attached")
} }
id1 := v.Attachments[0].VPCID id1 := v.Attachments[0].VpcId
id2 := v2.Attachments[0].VPCID id2 := v2.Attachments[0].VpcId
if id1 == id2 { if id1 == id2 {
return fmt.Errorf("Both attachment IDs are the same") return fmt.Errorf("Both attachment IDs are the same")
} }
@ -125,7 +125,7 @@ func testAccCheckInternetGatewayDestroy(s *terraform.State) error {
// Try to find the resource // Try to find the resource
resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{ resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{
InternetGatewayIDs: []*string{aws.String(rs.Primary.ID)}, InternetGatewayIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.InternetGateways) > 0 { if len(resp.InternetGateways) > 0 {
@ -161,7 +161,7 @@ func testAccCheckInternetGatewayExists(n string, ig *ec2.InternetGateway) resour
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{ resp, err := conn.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{
InternetGatewayIDs: []*string{aws.String(rs.Primary.ID)}, InternetGatewayIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err != nil { if err != nil {
return err return err

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

@ -165,7 +165,7 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err
function := getFunctionOutput.Configuration function := getFunctionOutput.Configuration
// TODO error checking / handling on the Set() calls. // TODO error checking / handling on the Set() calls.
d.Set("arn", function.FunctionARN) d.Set("arn", function.FunctionArn)
d.Set("description", function.Description) d.Set("description", function.Description)
d.Set("handler", function.Handler) d.Set("handler", function.Handler)
d.Set("memory_size", function.MemorySize) d.Set("memory_size", function.MemorySize)

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

@ -88,7 +88,7 @@ func testAccCheckAWSLambdaAttributes(function *lambda.GetFunctionOutput) resourc
return fmt.Errorf("Expected function name %s, got %s", expectedName, *c.FunctionName) return fmt.Errorf("Expected function name %s, got %s", expectedName, *c.FunctionName)
} }
if *c.FunctionARN == "" { if *c.FunctionArn == "" {
return fmt.Errorf("Could not read Lambda Function's ARN") return fmt.Errorf("Could not read Lambda Function's ARN")
} }

48
builtin/providers/aws/resource_aws_launch_configuration.go
View File

@ -262,9 +262,9 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
createLaunchConfigurationOpts := autoscaling.CreateLaunchConfigurationInput{ createLaunchConfigurationOpts := autoscaling.CreateLaunchConfigurationInput{
LaunchConfigurationName: aws.String(d.Get("name").(string)), LaunchConfigurationName: aws.String(d.Get("name").(string)),
ImageID: aws.String(d.Get("image_id").(string)), ImageId: aws.String(d.Get("image_id").(string)),
InstanceType: aws.String(d.Get("instance_type").(string)), InstanceType: aws.String(d.Get("instance_type").(string)),
EBSOptimized: aws.Bool(d.Get("ebs_optimized").(bool)), EbsOptimized: aws.Bool(d.Get("ebs_optimized").(bool)),
} }
if v, ok := d.GetOk("user_data"); ok { if v, ok := d.GetOk("user_data"); ok {
@ -277,7 +277,7 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
} }
if v, ok := d.GetOk("iam_instance_profile"); ok { if v, ok := d.GetOk("iam_instance_profile"); ok {
createLaunchConfigurationOpts.IAMInstanceProfile = aws.String(v.(string)) createLaunchConfigurationOpts.IamInstanceProfile = aws.String(v.(string))
} }
if v, ok := d.GetOk("placement_tenancy"); ok { if v, ok := d.GetOk("placement_tenancy"); ok {
@ -285,7 +285,7 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
} }
if v, ok := d.GetOk("associate_public_ip_address"); ok { if v, ok := d.GetOk("associate_public_ip_address"); ok {
createLaunchConfigurationOpts.AssociatePublicIPAddress = aws.Bool(v.(bool)) createLaunchConfigurationOpts.AssociatePublicIpAddress = aws.Bool(v.(bool))
} }
if v, ok := d.GetOk("key_name"); ok { if v, ok := d.GetOk("key_name"); ok {
@ -307,12 +307,12 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
vL := v.(*schema.Set).List() vL := v.(*schema.Set).List()
for _, v := range vL { for _, v := range vL {
bd := v.(map[string]interface{}) bd := v.(map[string]interface{})
ebs := &autoscaling.EBS{ ebs := &autoscaling.Ebs{
DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)), DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)),
} }
if v, ok := bd["snapshot_id"].(string); ok && v != "" { if v, ok := bd["snapshot_id"].(string); ok && v != "" {
ebs.SnapshotID = aws.String(v) ebs.SnapshotId = aws.String(v)
} }
if v, ok := bd["volume_size"].(int); ok && v != 0 { if v, ok := bd["volume_size"].(int); ok && v != 0 {
@ -324,12 +324,12 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
} }
if v, ok := bd["iops"].(int); ok && v > 0 { if v, ok := bd["iops"].(int); ok && v > 0 {
ebs.IOPS = aws.Int64(int64(v)) ebs.Iops = aws.Int64(int64(v))
} }
blockDevices = append(blockDevices, &autoscaling.BlockDeviceMapping{ blockDevices = append(blockDevices, &autoscaling.BlockDeviceMapping{
DeviceName: aws.String(bd["device_name"].(string)), DeviceName: aws.String(bd["device_name"].(string)),
EBS: ebs, Ebs: ebs,
}) })
} }
} }
@ -352,7 +352,7 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
} }
for _, v := range vL { for _, v := range vL {
bd := v.(map[string]interface{}) bd := v.(map[string]interface{})
ebs := &autoscaling.EBS{ ebs := &autoscaling.Ebs{
DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)), DeleteOnTermination: aws.Bool(bd["delete_on_termination"].(bool)),
} }
@ -365,13 +365,13 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
} }
if v, ok := bd["iops"].(int); ok && v > 0 { if v, ok := bd["iops"].(int); ok && v > 0 {
ebs.IOPS = aws.Int64(int64(v)) ebs.Iops = aws.Int64(int64(v))
} }
if dn, err := fetchRootDeviceName(d.Get("image_id").(string), ec2conn); err == nil { if dn, err := fetchRootDeviceName(d.Get("image_id").(string), ec2conn); err == nil {
blockDevices = append(blockDevices, &autoscaling.BlockDeviceMapping{ blockDevices = append(blockDevices, &autoscaling.BlockDeviceMapping{
DeviceName: dn, DeviceName: dn,
EBS: ebs, Ebs: ebs,
}) })
} else { } else {
return err return err
@ -453,12 +453,12 @@ func resourceAwsLaunchConfigurationRead(d *schema.ResourceData, meta interface{}
lc := describConfs.LaunchConfigurations[0] lc := describConfs.LaunchConfigurations[0]
d.Set("key_name", lc.KeyName) d.Set("key_name", lc.KeyName)
d.Set("image_id", lc.ImageID) d.Set("image_id", lc.ImageId)
d.Set("instance_type", lc.InstanceType) d.Set("instance_type", lc.InstanceType)
d.Set("name", lc.LaunchConfigurationName) d.Set("name", lc.LaunchConfigurationName)
d.Set("iam_instance_profile", lc.IAMInstanceProfile) d.Set("iam_instance_profile", lc.IamInstanceProfile)
d.Set("ebs_optimized", lc.EBSOptimized) d.Set("ebs_optimized", lc.EbsOptimized)
d.Set("spot_price", lc.SpotPrice) d.Set("spot_price", lc.SpotPrice)
d.Set("enable_monitoring", lc.InstanceMonitoring.Enabled) d.Set("enable_monitoring", lc.InstanceMonitoring.Enabled)
d.Set("security_groups", lc.SecurityGroups) d.Set("security_groups", lc.SecurityGroups)
@ -534,17 +534,17 @@ func readBlockDevicesFromLaunchConfiguration(d *schema.ResourceData, lc *autosca
} }
for _, bdm := range lc.BlockDeviceMappings { for _, bdm := range lc.BlockDeviceMappings {
bd := make(map[string]interface{}) bd := make(map[string]interface{})
if bdm.EBS != nil && bdm.EBS.DeleteOnTermination != nil { if bdm.Ebs != nil && bdm.Ebs.DeleteOnTermination != nil {
bd["delete_on_termination"] = *bdm.EBS.DeleteOnTermination bd["delete_on_termination"] = *bdm.Ebs.DeleteOnTermination
} }
if bdm.EBS != nil && bdm.EBS.VolumeSize != nil { if bdm.Ebs != nil && bdm.Ebs.VolumeSize != nil {
bd["volume_size"] = *bdm.EBS.VolumeSize bd["volume_size"] = *bdm.Ebs.VolumeSize
} }
if bdm.EBS != nil && bdm.EBS.VolumeType != nil { if bdm.Ebs != nil && bdm.Ebs.VolumeType != nil {
bd["volume_type"] = *bdm.EBS.VolumeType bd["volume_type"] = *bdm.Ebs.VolumeType
} }
if bdm.EBS != nil && bdm.EBS.IOPS != nil { if bdm.Ebs != nil && bdm.Ebs.Iops != nil {
bd["iops"] = *bdm.EBS.IOPS bd["iops"] = *bdm.Ebs.Iops
} }
if bdm.DeviceName != nil && *bdm.DeviceName == *rootDeviceName { if bdm.DeviceName != nil && *bdm.DeviceName == *rootDeviceName {
blockDevices["root"] = bd blockDevices["root"] = bd
@ -556,8 +556,8 @@ func readBlockDevicesFromLaunchConfiguration(d *schema.ResourceData, lc *autosca
bd["virtual_name"] = *bdm.VirtualName bd["virtual_name"] = *bdm.VirtualName
blockDevices["ephemeral"] = append(blockDevices["ephemeral"].([]map[string]interface{}), bd) blockDevices["ephemeral"] = append(blockDevices["ephemeral"].([]map[string]interface{}), bd)
} else { } else {
if bdm.EBS != nil && bdm.EBS.SnapshotID != nil { if bdm.Ebs != nil && bdm.Ebs.SnapshotId != nil {
bd["snapshot_id"] = *bdm.EBS.SnapshotID bd["snapshot_id"] = *bdm.Ebs.SnapshotId
} }
blockDevices["ebs"] = append(blockDevices["ebs"].([]map[string]interface{}), bd) blockDevices["ebs"] = append(blockDevices["ebs"].([]map[string]interface{}), bd)
} }

4
builtin/providers/aws/resource_aws_launch_configuration_test.go
View File

@ -134,8 +134,8 @@ func testAccCheckAWSLaunchConfigurationDestroy(s *terraform.State) error {
func testAccCheckAWSLaunchConfigurationAttributes(conf *autoscaling.LaunchConfiguration) resource.TestCheckFunc { func testAccCheckAWSLaunchConfigurationAttributes(conf *autoscaling.LaunchConfiguration) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
if *conf.ImageID != "ami-21f78e11" { if *conf.ImageId != "ami-21f78e11" {
return fmt.Errorf("Bad image_id: %s", *conf.ImageID) return fmt.Errorf("Bad image_id: %s", *conf.ImageId)
} }
if !strings.HasPrefix(*conf.LaunchConfigurationName, "terraform-") { if !strings.HasPrefix(*conf.LaunchConfigurationName, "terraform-") {

22
builtin/providers/aws/resource_aws_main_route_table_association.go
View File

@ -52,15 +52,15 @@ func resourceAwsMainRouteTableAssociationCreate(d *schema.ResourceData, meta int
} }
resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{ resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{
AssociationID: mainAssociation.RouteTableAssociationID, AssociationId: mainAssociation.RouteTableAssociationId,
RouteTableID: aws.String(routeTableId), RouteTableId: aws.String(routeTableId),
}) })
if err != nil { if err != nil {
return err return err
} }
d.Set("original_route_table_id", mainAssociation.RouteTableID) d.Set("original_route_table_id", mainAssociation.RouteTableId)
d.SetId(*resp.NewAssociationID) d.SetId(*resp.NewAssociationId)
log.Printf("[INFO] New main route table association ID: %s", d.Id()) log.Printf("[INFO] New main route table association ID: %s", d.Id())
return nil return nil
@ -76,7 +76,7 @@ func resourceAwsMainRouteTableAssociationRead(d *schema.ResourceData, meta inter
return err return err
} }
if mainAssociation == nil || *mainAssociation.RouteTableAssociationID != d.Id() { if mainAssociation == nil || *mainAssociation.RouteTableAssociationId != d.Id() {
// It seems it doesn't exist anymore, so clear the ID // It seems it doesn't exist anymore, so clear the ID
d.SetId("") d.SetId("")
} }
@ -95,14 +95,14 @@ func resourceAwsMainRouteTableAssociationUpdate(d *schema.ResourceData, meta int
log.Printf("[INFO] Updating main route table association: %s => %s", vpcId, routeTableId) log.Printf("[INFO] Updating main route table association: %s => %s", vpcId, routeTableId)
resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{ resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{
AssociationID: aws.String(d.Id()), AssociationId: aws.String(d.Id()),
RouteTableID: aws.String(routeTableId), RouteTableId: aws.String(routeTableId),
}) })
if err != nil { if err != nil {
return err return err
} }
d.SetId(*resp.NewAssociationID) d.SetId(*resp.NewAssociationId)
log.Printf("[INFO] New main route table association ID: %s", d.Id()) log.Printf("[INFO] New main route table association ID: %s", d.Id())
return nil return nil
@ -118,14 +118,14 @@ func resourceAwsMainRouteTableAssociationDelete(d *schema.ResourceData, meta int
originalRouteTableId) originalRouteTableId)
resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{ resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{
AssociationID: aws.String(d.Id()), AssociationId: aws.String(d.Id()),
RouteTableID: aws.String(originalRouteTableId), RouteTableId: aws.String(originalRouteTableId),
}) })
if err != nil { if err != nil {
return err return err
} }
log.Printf("[INFO] Resulting Association ID: %s", *resp.NewAssociationID) log.Printf("[INFO] Resulting Association ID: %s", *resp.NewAssociationId)
return nil return nil
} }

4
builtin/providers/aws/resource_aws_main_route_table_association_test.go
View File

@ -71,9 +71,9 @@ func testAccCheckMainRouteTableAssociation(
return err return err
} }
if *mainAssociation.RouteTableAssociationID != rs.Primary.ID { if *mainAssociation.RouteTableAssociationId != rs.Primary.ID {
return fmt.Errorf("Found wrong main association: %s", return fmt.Errorf("Found wrong main association: %s",
*mainAssociation.RouteTableAssociationID) *mainAssociation.RouteTableAssociationId)
} }
return nil return nil

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

@ -140,20 +140,20 @@ func resourceAwsNetworkAclCreate(d *schema.ResourceData, meta interface{}) error
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
// Create the Network Acl // Create the Network Acl
createOpts := &ec2.CreateNetworkACLInput{ createOpts := &ec2.CreateNetworkAclInput{
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
} }
log.Printf("[DEBUG] Network Acl create config: %#v", createOpts) log.Printf("[DEBUG] Network Acl create config: %#v", createOpts)
resp, err := conn.CreateNetworkACL(createOpts) resp, err := conn.CreateNetworkAcl(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating network acl: %s", err) return fmt.Errorf("Error creating network acl: %s", err)
} }
// Get the ID and store it // Get the ID and store it
networkAcl := resp.NetworkACL networkAcl := resp.NetworkAcl
d.SetId(*networkAcl.NetworkACLID) d.SetId(*networkAcl.NetworkAclId)
log.Printf("[INFO] Network Acl ID: %s", *networkAcl.NetworkACLID) log.Printf("[INFO] Network Acl ID: %s", *networkAcl.NetworkAclId)
// Update rules and subnet association once acl is created // Update rules and subnet association once acl is created
return resourceAwsNetworkAclUpdate(d, meta) return resourceAwsNetworkAclUpdate(d, meta)
@ -162,8 +162,8 @@ func resourceAwsNetworkAclCreate(d *schema.ResourceData, meta interface{}) error
func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
NetworkACLIDs: []*string{aws.String(d.Id())}, NetworkAclIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
@ -173,9 +173,9 @@ func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error {
return nil return nil
} }
networkAcl := resp.NetworkACLs[0] networkAcl := resp.NetworkAcls[0]
var ingressEntries []*ec2.NetworkACLEntry var ingressEntries []*ec2.NetworkAclEntry
var egressEntries []*ec2.NetworkACLEntry var egressEntries []*ec2.NetworkAclEntry
// separate the ingress and egress rules // separate the ingress and egress rules
for _, e := range networkAcl.Entries { for _, e := range networkAcl.Entries {
@ -192,12 +192,12 @@ func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error {
} }
} }
d.Set("vpc_id", networkAcl.VPCID) d.Set("vpc_id", networkAcl.VpcId)
d.Set("tags", tagsToMap(networkAcl.Tags)) d.Set("tags", tagsToMap(networkAcl.Tags))
var s []string var s []string
for _, a := range networkAcl.Associations { for _, a := range networkAcl.Associations {
s = append(s, *a.SubnetID) s = append(s, *a.SubnetId)
} }
sort.Strings(s) sort.Strings(s)
if err := d.Set("subnet_ids", s); err != nil { if err := d.Set("subnet_ids", s); err != nil {
@ -240,9 +240,9 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error
if err != nil { if err != nil {
return fmt.Errorf("Failed to update acl %s with subnet %s: %s", d.Id(), newSubnet, err) return fmt.Errorf("Failed to update acl %s with subnet %s: %s", d.Id(), newSubnet, err)
} }
_, err = conn.ReplaceNetworkACLAssociation(&ec2.ReplaceNetworkACLAssociationInput{ _, err = conn.ReplaceNetworkAclAssociation(&ec2.ReplaceNetworkAclAssociationInput{
AssociationID: association.NetworkACLAssociationID, AssociationId: association.NetworkAclAssociationId,
NetworkACLID: aws.String(d.Id()), NetworkAclId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
return err return err
@ -276,9 +276,9 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error
if err != nil { if err != nil {
return fmt.Errorf("Failed to find acl association: acl %s with subnet %s: %s", d.Id(), r, err) return fmt.Errorf("Failed to find acl association: acl %s with subnet %s: %s", d.Id(), r, err)
} }
_, err = conn.ReplaceNetworkACLAssociation(&ec2.ReplaceNetworkACLAssociationInput{ _, err = conn.ReplaceNetworkAclAssociation(&ec2.ReplaceNetworkAclAssociationInput{
AssociationID: association.NetworkACLAssociationID, AssociationId: association.NetworkAclAssociationId,
NetworkACLID: defaultAcl.NetworkACLID, NetworkAclId: defaultAcl.NetworkAclId,
}) })
if err != nil { if err != nil {
return err return err
@ -292,9 +292,9 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error
if err != nil { if err != nil {
return fmt.Errorf("Failed to find acl association: acl %s with subnet %s: %s", d.Id(), a, err) return fmt.Errorf("Failed to find acl association: acl %s with subnet %s: %s", d.Id(), a, err)
} }
_, err = conn.ReplaceNetworkACLAssociation(&ec2.ReplaceNetworkACLAssociationInput{ _, err = conn.ReplaceNetworkAclAssociation(&ec2.ReplaceNetworkAclAssociationInput{
AssociationID: association.NetworkACLAssociationID, AssociationId: association.NetworkAclAssociationId,
NetworkACLID: aws.String(d.Id()), NetworkAclId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
return err return err
@ -343,8 +343,8 @@ func updateNetworkAclEntries(d *schema.ResourceData, entryType string, conn *ec2
} }
// Delete old Acl // Delete old Acl
_, err := conn.DeleteNetworkACLEntry(&ec2.DeleteNetworkACLEntryInput{ _, err := conn.DeleteNetworkAclEntry(&ec2.DeleteNetworkAclEntryInput{
NetworkACLID: aws.String(d.Id()), NetworkAclId: aws.String(d.Id()),
RuleNumber: remove.RuleNumber, RuleNumber: remove.RuleNumber,
Egress: remove.Egress, Egress: remove.Egress,
}) })
@ -380,20 +380,20 @@ func updateNetworkAclEntries(d *schema.ResourceData, entryType string, conn *ec2
// mask provided. This results in hashing inconsistencies between // mask provided. This results in hashing inconsistencies between
// the local config file and the state returned by the API. Error // the local config file and the state returned by the API. Error
// if the user provides a CIDR block with an inappropriate mask // if the user provides a CIDR block with an inappropriate mask
if err := validateCIDRBlock(*add.CIDRBlock); err != nil { if err := validateCIDRBlock(*add.CidrBlock); err != nil {
return err return err
} }
// Add new Acl entry // Add new Acl entry
_, connErr := conn.CreateNetworkACLEntry(&ec2.CreateNetworkACLEntryInput{ _, connErr := conn.CreateNetworkAclEntry(&ec2.CreateNetworkAclEntryInput{
NetworkACLID: aws.String(d.Id()), NetworkAclId: aws.String(d.Id()),
CIDRBlock: add.CIDRBlock, CidrBlock: add.CidrBlock,
Egress: add.Egress, Egress: add.Egress,
PortRange: add.PortRange, PortRange: add.PortRange,
Protocol: add.Protocol, Protocol: add.Protocol,
RuleAction: add.RuleAction, RuleAction: add.RuleAction,
RuleNumber: add.RuleNumber, RuleNumber: add.RuleNumber,
ICMPTypeCode: add.ICMPTypeCode, IcmpTypeCode: add.IcmpTypeCode,
}) })
if connErr != nil { if connErr != nil {
return fmt.Errorf("Error creating %s entry: %s", entryType, connErr) return fmt.Errorf("Error creating %s entry: %s", entryType, connErr)
@ -407,8 +407,8 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error
log.Printf("[INFO] Deleting Network Acl: %s", d.Id()) log.Printf("[INFO] Deleting Network Acl: %s", d.Id())
return resource.Retry(5*time.Minute, func() error { return resource.Retry(5*time.Minute, func() error {
_, err := conn.DeleteNetworkACL(&ec2.DeleteNetworkACLInput{ _, err := conn.DeleteNetworkAcl(&ec2.DeleteNetworkAclInput{
NetworkACLID: aws.String(d.Id()), NetworkAclId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
ec2err := err.(awserr.Error) ec2err := err.(awserr.Error)
@ -418,7 +418,7 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error
case "DependencyViolation": case "DependencyViolation":
// In case of dependency violation, we remove the association between subnet and network acl. // In case of dependency violation, we remove the association between subnet and network acl.
// This means the subnet is attached to default acl of vpc. // This means the subnet is attached to default acl of vpc.
var associations []*ec2.NetworkACLAssociation var associations []*ec2.NetworkAclAssociation
if v, ok := d.GetOk("subnet_id"); ok { if v, ok := d.GetOk("subnet_id"); ok {
a, err := findNetworkAclAssociation(v.(string), conn) a, err := findNetworkAclAssociation(v.(string), conn)
@ -442,9 +442,9 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error
} }
for _, a := range associations { for _, a := range associations {
_, err = conn.ReplaceNetworkACLAssociation(&ec2.ReplaceNetworkACLAssociationInput{ _, err = conn.ReplaceNetworkAclAssociation(&ec2.ReplaceNetworkAclAssociationInput{
AssociationID: a.NetworkACLAssociationID, AssociationId: a.NetworkAclAssociationId,
NetworkACLID: defaultAcl.NetworkACLID, NetworkAclId: defaultAcl.NetworkAclId,
}) })
} }
return resource.RetryError{Err: err} return resource.RetryError{Err: err}
@ -493,8 +493,8 @@ func resourceAwsNetworkAclEntryHash(v interface{}) int {
return hashcode.String(buf.String()) return hashcode.String(buf.String())
} }
func getDefaultNetworkAcl(vpc_id string, conn *ec2.EC2) (defaultAcl *ec2.NetworkACL, err error) { func getDefaultNetworkAcl(vpc_id string, conn *ec2.EC2) (defaultAcl *ec2.NetworkAcl, err error) {
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("default"), Name: aws.String("default"),
@ -510,11 +510,11 @@ func getDefaultNetworkAcl(vpc_id string, conn *ec2.EC2) (defaultAcl *ec2.Network
if err != nil { if err != nil {
return nil, err return nil, err
} }
return resp.NetworkACLs[0], nil return resp.NetworkAcls[0], nil
} }
func findNetworkAclAssociation(subnetId string, conn *ec2.EC2) (networkAclAssociation *ec2.NetworkACLAssociation, err error) { func findNetworkAclAssociation(subnetId string, conn *ec2.EC2) (networkAclAssociation *ec2.NetworkAclAssociation, err error) {
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("association.subnet-id"), Name: aws.String("association.subnet-id"),
@ -526,9 +526,9 @@ func findNetworkAclAssociation(subnetId string, conn *ec2.EC2) (networkAclAssoci
if err != nil { if err != nil {
return nil, err return nil, err
} }
if resp.NetworkACLs != nil && len(resp.NetworkACLs) > 0 { if resp.NetworkAcls != nil && len(resp.NetworkAcls) > 0 {
for _, association := range resp.NetworkACLs[0].Associations { for _, association := range resp.NetworkAcls[0].Associations {
if *association.SubnetID == subnetId { if *association.SubnetId == subnetId {
return association, nil return association, nil
} }
} }
@ -538,13 +538,13 @@ func findNetworkAclAssociation(subnetId string, conn *ec2.EC2) (networkAclAssoci
// networkAclEntriesToMapList turns ingress/egress rules read from AWS into a list // networkAclEntriesToMapList turns ingress/egress rules read from AWS into a list
// of maps. // of maps.
func networkAclEntriesToMapList(networkAcls []*ec2.NetworkACLEntry) []map[string]interface{} { func networkAclEntriesToMapList(networkAcls []*ec2.NetworkAclEntry) []map[string]interface{} {
result := make([]map[string]interface{}, 0, len(networkAcls)) result := make([]map[string]interface{}, 0, len(networkAcls))
for _, entry := range networkAcls { for _, entry := range networkAcls {
acl := make(map[string]interface{}) acl := make(map[string]interface{})
acl["rule_no"] = *entry.RuleNumber acl["rule_no"] = *entry.RuleNumber
acl["action"] = *entry.RuleAction acl["action"] = *entry.RuleAction
acl["cidr_block"] = *entry.CIDRBlock acl["cidr_block"] = *entry.CidrBlock
// The AWS network ACL API only speaks protocol numbers, and // The AWS network ACL API only speaks protocol numbers, and
// that's all we record. // that's all we record.
@ -562,9 +562,9 @@ func networkAclEntriesToMapList(networkAcls []*ec2.NetworkACLEntry) []map[string
acl["to_port"] = *entry.PortRange.To acl["to_port"] = *entry.PortRange.To
} }
if entry.ICMPTypeCode != nil { if entry.IcmpTypeCode != nil {
acl["icmp_type"] = *entry.ICMPTypeCode.Type acl["icmp_type"] = *entry.IcmpTypeCode.Type
acl["icmp_code"] = *entry.ICMPTypeCode.Code acl["icmp_code"] = *entry.IcmpTypeCode.Code
} }
result = append(result, acl) result = append(result, acl)

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

@ -12,7 +12,7 @@ import (
) )
func TestAccAWSNetworkAcl_EgressAndIngressRules(t *testing.T) { func TestAccAWSNetworkAcl_EgressAndIngressRules(t *testing.T) {
var networkAcl ec2.NetworkACL var networkAcl ec2.NetworkAcl
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -54,7 +54,7 @@ func TestAccAWSNetworkAcl_EgressAndIngressRules(t *testing.T) {
} }
func TestAccAWSNetworkAcl_OnlyIngressRules_basic(t *testing.T) { func TestAccAWSNetworkAcl_OnlyIngressRules_basic(t *testing.T) {
var networkAcl ec2.NetworkACL var networkAcl ec2.NetworkAcl
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -85,7 +85,7 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_basic(t *testing.T) {
} }
func TestAccAWSNetworkAcl_OnlyIngressRules_update(t *testing.T) { func TestAccAWSNetworkAcl_OnlyIngressRules_update(t *testing.T) {
var networkAcl ec2.NetworkACL var networkAcl ec2.NetworkAcl
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -139,7 +139,7 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_update(t *testing.T) {
} }
func TestAccAWSNetworkAcl_OnlyEgressRules(t *testing.T) { func TestAccAWSNetworkAcl_OnlyEgressRules(t *testing.T) {
var networkAcl ec2.NetworkACL var networkAcl ec2.NetworkAcl
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -183,9 +183,9 @@ func TestAccAWSNetworkAcl_SubnetChange(t *testing.T) {
} }
func TestAccAWSNetworkAcl_Subnets(t *testing.T) { func TestAccAWSNetworkAcl_Subnets(t *testing.T) {
var networkAcl ec2.NetworkACL var networkAcl ec2.NetworkAcl
checkACLSubnets := func(acl *ec2.NetworkACL, count int) resource.TestCheckFunc { checkACLSubnets := func(acl *ec2.NetworkAcl, count int) resource.TestCheckFunc {
return func(*terraform.State) (err error) { return func(*terraform.State) (err error) {
if count != len(acl.Associations) { if count != len(acl.Associations) {
return fmt.Errorf("ACL association count does not match, expected %d, got %d", count, len(acl.Associations)) return fmt.Errorf("ACL association count does not match, expected %d, got %d", count, len(acl.Associations))
@ -234,11 +234,11 @@ func testAccCheckAWSNetworkAclDestroy(s *terraform.State) error {
} }
// Retrieve the network acl // Retrieve the network acl
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
NetworkACLIDs: []*string{aws.String(rs.Primary.ID)}, NetworkAclIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.NetworkACLs) > 0 && *resp.NetworkACLs[0].NetworkACLID == rs.Primary.ID { if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID {
return fmt.Errorf("Network Acl (%s) still exists.", rs.Primary.ID) return fmt.Errorf("Network Acl (%s) still exists.", rs.Primary.ID)
} }
@ -258,7 +258,7 @@ func testAccCheckAWSNetworkAclDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckAWSNetworkAclExists(n string, networkAcl *ec2.NetworkACL) resource.TestCheckFunc { func testAccCheckAWSNetworkAclExists(n string, networkAcl *ec2.NetworkAcl) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -270,15 +270,15 @@ func testAccCheckAWSNetworkAclExists(n string, networkAcl *ec2.NetworkACL) resou
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
NetworkACLIDs: []*string{aws.String(rs.Primary.ID)}, NetworkAclIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err != nil { if err != nil {
return err return err
} }
if len(resp.NetworkACLs) > 0 && *resp.NetworkACLs[0].NetworkACLID == rs.Primary.ID { if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID {
*networkAcl = *resp.NetworkACLs[0] *networkAcl = *resp.NetworkAcls[0]
return nil return nil
} }
@ -286,9 +286,9 @@ func testAccCheckAWSNetworkAclExists(n string, networkAcl *ec2.NetworkACL) resou
} }
} }
func testIngressRuleLength(networkAcl *ec2.NetworkACL, length int) resource.TestCheckFunc { func testIngressRuleLength(networkAcl *ec2.NetworkAcl, length int) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
var ingressEntries []*ec2.NetworkACLEntry var ingressEntries []*ec2.NetworkAclEntry
for _, e := range networkAcl.Entries { for _, e := range networkAcl.Entries {
if *e.Egress == false { if *e.Egress == false {
ingressEntries = append(ingressEntries, e) ingressEntries = append(ingressEntries, e)
@ -309,8 +309,8 @@ func testAccCheckSubnetIsAssociatedWithAcl(acl string, sub string) resource.Test
subnet := s.RootModule().Resources[sub] subnet := s.RootModule().Resources[sub]
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
NetworkACLIDs: []*string{aws.String(networkAcl.Primary.ID)}, NetworkAclIds: []*string{aws.String(networkAcl.Primary.ID)},
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("association.subnet-id"), Name: aws.String("association.subnet-id"),
@ -321,7 +321,7 @@ func testAccCheckSubnetIsAssociatedWithAcl(acl string, sub string) resource.Test
if err != nil { if err != nil {
return err return err
} }
if len(resp.NetworkACLs) > 0 { if len(resp.NetworkAcls) > 0 {
return nil return nil
} }
@ -335,8 +335,8 @@ func testAccCheckSubnetIsNotAssociatedWithAcl(acl string, subnet string) resourc
subnet := s.RootModule().Resources[subnet] subnet := s.RootModule().Resources[subnet]
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeNetworkACLs(&ec2.DescribeNetworkACLsInput{ resp, err := conn.DescribeNetworkAcls(&ec2.DescribeNetworkAclsInput{
NetworkACLIDs: []*string{aws.String(networkAcl.Primary.ID)}, NetworkAclIds: []*string{aws.String(networkAcl.Primary.ID)},
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("association.subnet-id"), Name: aws.String("association.subnet-id"),
@ -348,7 +348,7 @@ func testAccCheckSubnetIsNotAssociatedWithAcl(acl string, subnet string) resourc
if err != nil { if err != nil {
return err return err
} }
if len(resp.NetworkACLs) > 0 { if len(resp.NetworkAcls) > 0 {
return fmt.Errorf("Network Acl %s is still associated with subnet %s", acl, subnet) return fmt.Errorf("Network Acl %s is still associated with subnet %s", acl, subnet)
} }
return nil return nil

26
builtin/providers/aws/resource_aws_network_interface.go
View File

@ -86,7 +86,7 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{})
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
request := &ec2.CreateNetworkInterfaceInput{ request := &ec2.CreateNetworkInterfaceInput{
SubnetID: aws.String(d.Get("subnet_id").(string)), SubnetId: aws.String(d.Get("subnet_id").(string)),
} }
security_groups := d.Get("security_groups").(*schema.Set).List() security_groups := d.Get("security_groups").(*schema.Set).List()
@ -96,7 +96,7 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{})
private_ips := d.Get("private_ips").(*schema.Set).List() private_ips := d.Get("private_ips").(*schema.Set).List()
if len(private_ips) != 0 { if len(private_ips) != 0 {
request.PrivateIPAddresses = expandPrivateIPAddesses(private_ips) request.PrivateIpAddresses = expandPrivateIPAddesses(private_ips)
} }
log.Printf("[DEBUG] Creating network interface") log.Printf("[DEBUG] Creating network interface")
@ -105,7 +105,7 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error creating ENI: %s", err) return fmt.Errorf("Error creating ENI: %s", err)
} }
d.SetId(*resp.NetworkInterface.NetworkInterfaceID) d.SetId(*resp.NetworkInterface.NetworkInterfaceId)
log.Printf("[INFO] ENI ID: %s", d.Id()) log.Printf("[INFO] ENI ID: %s", d.Id())
return resourceAwsNetworkInterfaceUpdate(d, meta) return resourceAwsNetworkInterfaceUpdate(d, meta)
} }
@ -114,7 +114,7 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{ describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{
NetworkInterfaceIDs: []*string{aws.String(d.Id())}, NetworkInterfaceIds: []*string{aws.String(d.Id())},
} }
describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request) describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request)
@ -132,8 +132,8 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e
} }
eni := describeResp.NetworkInterfaces[0] eni := describeResp.NetworkInterfaces[0]
d.Set("subnet_id", eni.SubnetID) d.Set("subnet_id", eni.SubnetId)
d.Set("private_ips", flattenNetworkInterfacesPrivateIPAddesses(eni.PrivateIPAddresses)) d.Set("private_ips", flattenNetworkInterfacesPrivateIPAddesses(eni.PrivateIpAddresses))
d.Set("security_groups", flattenGroupIdentifiers(eni.Groups)) d.Set("security_groups", flattenGroupIdentifiers(eni.Groups))
d.Set("source_dest_check", eni.SourceDestCheck) d.Set("source_dest_check", eni.SourceDestCheck)
@ -154,7 +154,7 @@ func networkInterfaceAttachmentRefreshFunc(conn *ec2.EC2, id string) resource.St
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{ describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{
NetworkInterfaceIDs: []*string{aws.String(id)}, NetworkInterfaceIds: []*string{aws.String(id)},
} }
describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request) describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request)
@ -175,7 +175,7 @@ func resourceAwsNetworkInterfaceDetach(oa *schema.Set, meta interface{}, eniId s
if oa != nil && len(oa.List()) > 0 { if oa != nil && len(oa.List()) > 0 {
old_attachment := oa.List()[0].(map[string]interface{}) old_attachment := oa.List()[0].(map[string]interface{})
detach_request := &ec2.DetachNetworkInterfaceInput{ detach_request := &ec2.DetachNetworkInterfaceInput{
AttachmentID: aws.String(old_attachment["attachment_id"].(string)), AttachmentId: aws.String(old_attachment["attachment_id"].(string)),
Force: aws.Bool(true), Force: aws.Bool(true),
} }
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
@ -218,8 +218,8 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{})
di := new_attachment["device_index"].(int) di := new_attachment["device_index"].(int)
attach_request := &ec2.AttachNetworkInterfaceInput{ attach_request := &ec2.AttachNetworkInterfaceInput{
DeviceIndex: aws.Int64(int64(di)), DeviceIndex: aws.Int64(int64(di)),
InstanceID: aws.String(new_attachment["instance"].(string)), InstanceId: aws.String(new_attachment["instance"].(string)),
NetworkInterfaceID: aws.String(d.Id()), NetworkInterfaceId: aws.String(d.Id()),
} }
_, attach_err := conn.AttachNetworkInterface(attach_request) _, attach_err := conn.AttachNetworkInterface(attach_request)
if attach_err != nil { if attach_err != nil {
@ -231,7 +231,7 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{})
} }
request := &ec2.ModifyNetworkInterfaceAttributeInput{ request := &ec2.ModifyNetworkInterfaceAttributeInput{
NetworkInterfaceID: aws.String(d.Id()), NetworkInterfaceId: aws.String(d.Id()),
SourceDestCheck: &ec2.AttributeBooleanValue{Value: aws.Bool(d.Get("source_dest_check").(bool))}, SourceDestCheck: &ec2.AttributeBooleanValue{Value: aws.Bool(d.Get("source_dest_check").(bool))},
} }
@ -244,7 +244,7 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{})
if d.HasChange("security_groups") { if d.HasChange("security_groups") {
request := &ec2.ModifyNetworkInterfaceAttributeInput{ request := &ec2.ModifyNetworkInterfaceAttributeInput{
NetworkInterfaceID: aws.String(d.Id()), NetworkInterfaceId: aws.String(d.Id()),
Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()), Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()),
} }
@ -278,7 +278,7 @@ func resourceAwsNetworkInterfaceDelete(d *schema.ResourceData, meta interface{})
} }
deleteEniOpts := ec2.DeleteNetworkInterfaceInput{ deleteEniOpts := ec2.DeleteNetworkInterfaceInput{
NetworkInterfaceID: aws.String(d.Id()), NetworkInterfaceId: aws.String(d.Id()),
} }
if _, err := conn.DeleteNetworkInterface(&deleteEniOpts); err != nil { if _, err := conn.DeleteNetworkInterface(&deleteEniOpts); err != nil {
return fmt.Errorf("Error deleting ENI: %s", err) return fmt.Errorf("Error deleting ENI: %s", err)

18
builtin/providers/aws/resource_aws_network_interface_test.go
View File

@ -130,7 +130,7 @@ func testAccCheckAWSENIExists(n string, res *ec2.NetworkInterface) resource.Test
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{ describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{
NetworkInterfaceIDs: []*string{aws.String(rs.Primary.ID)}, NetworkInterfaceIds: []*string{aws.String(rs.Primary.ID)},
} }
describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request) describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request)
@ -139,7 +139,7 @@ func testAccCheckAWSENIExists(n string, res *ec2.NetworkInterface) resource.Test
} }
if len(describeResp.NetworkInterfaces) != 1 || if len(describeResp.NetworkInterfaces) != 1 ||
*describeResp.NetworkInterfaces[0].NetworkInterfaceID != rs.Primary.ID { *describeResp.NetworkInterfaces[0].NetworkInterfaceId != rs.Primary.ID {
return fmt.Errorf("ENI not found") return fmt.Errorf("ENI not found")
} }
@ -164,8 +164,8 @@ func testAccCheckAWSENIAttributes(conf *ec2.NetworkInterface) resource.TestCheck
return fmt.Errorf("expected security group to be foo, but was %#v", conf.Groups) return fmt.Errorf("expected security group to be foo, but was %#v", conf.Groups)
} }
if *conf.PrivateIPAddress != "172.16.10.100" { if *conf.PrivateIpAddress != "172.16.10.100" {
return fmt.Errorf("expected private ip to be 172.16.10.100, but was %s", *conf.PrivateIPAddress) return fmt.Errorf("expected private ip to be 172.16.10.100, but was %s", *conf.PrivateIpAddress)
} }
if *conf.SourceDestCheck != true { if *conf.SourceDestCheck != true {
@ -199,8 +199,8 @@ func testAccCheckAWSENIAttributesWithAttachment(conf *ec2.NetworkInterface) reso
return fmt.Errorf("expected security group to be foo, but was %#v", conf.Groups) return fmt.Errorf("expected security group to be foo, but was %#v", conf.Groups)
} }
if *conf.PrivateIPAddress != "172.16.10.100" { if *conf.PrivateIpAddress != "172.16.10.100" {
return fmt.Errorf("expected private ip to be 172.16.10.100, but was %s", *conf.PrivateIPAddress) return fmt.Errorf("expected private ip to be 172.16.10.100, but was %s", *conf.PrivateIpAddress)
} }
return nil return nil
@ -215,7 +215,7 @@ func testAccCheckAWSENIDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{ describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{
NetworkInterfaceIDs: []*string{aws.String(rs.Primary.ID)}, NetworkInterfaceIds: []*string{aws.String(rs.Primary.ID)},
} }
_, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request) _, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request)
@ -239,8 +239,8 @@ func testAccCheckAWSENIMakeExternalAttachment(n string, conf *ec2.NetworkInterfa
} }
attach_request := &ec2.AttachNetworkInterfaceInput{ attach_request := &ec2.AttachNetworkInterfaceInput{
DeviceIndex: aws.Int64(2), DeviceIndex: aws.Int64(2),
InstanceID: aws.String(rs.Primary.ID), InstanceId: aws.String(rs.Primary.ID),
NetworkInterfaceID: conf.NetworkInterfaceID, NetworkInterfaceId: conf.NetworkInterfaceId,
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
_, attach_err := conn.AttachNetworkInterface(attach_request) _, attach_err := conn.AttachNetworkInterface(attach_request)

8
builtin/providers/aws/resource_aws_route53_delegation_set.go
View File

@ -55,7 +55,7 @@ func resourceAwsRoute53DelegationSetCreate(d *schema.ResourceData, meta interfac
log.Printf("[DEBUG] Route53 reusable delegation set created: %#v", out) log.Printf("[DEBUG] Route53 reusable delegation set created: %#v", out)
set := out.DelegationSet set := out.DelegationSet
d.SetId(cleanDelegationSetId(*set.ID)) d.SetId(cleanDelegationSetId(*set.Id))
d.Set("name_servers", expandNameServers(set.NameServers)) d.Set("name_servers", expandNameServers(set.NameServers))
return nil return nil
} }
@ -64,7 +64,7 @@ func resourceAwsRoute53DelegationSetRead(d *schema.ResourceData, meta interface{
r53 := meta.(*AWSClient).r53conn r53 := meta.(*AWSClient).r53conn
input := &route53.GetReusableDelegationSetInput{ input := &route53.GetReusableDelegationSetInput{
ID: aws.String(cleanDelegationSetId(d.Id())), Id: aws.String(cleanDelegationSetId(d.Id())),
} }
log.Printf("[DEBUG] Reading Route53 reusable delegation set: %#v", input) log.Printf("[DEBUG] Reading Route53 reusable delegation set: %#v", input)
out, err := r53.GetReusableDelegationSet(input) out, err := r53.GetReusableDelegationSet(input)
@ -75,7 +75,7 @@ func resourceAwsRoute53DelegationSetRead(d *schema.ResourceData, meta interface{
set := out.DelegationSet set := out.DelegationSet
d.SetId(cleanDelegationSetId(*set.ID)) d.SetId(cleanDelegationSetId(*set.Id))
d.Set("name_servers", expandNameServers(set.NameServers)) d.Set("name_servers", expandNameServers(set.NameServers))
return nil return nil
@ -85,7 +85,7 @@ func resourceAwsRoute53DelegationSetDelete(d *schema.ResourceData, meta interfac
r53 := meta.(*AWSClient).r53conn r53 := meta.(*AWSClient).r53conn
input := &route53.DeleteReusableDelegationSetInput{ input := &route53.DeleteReusableDelegationSetInput{
ID: aws.String(cleanDelegationSetId(d.Id())), Id: aws.String(cleanDelegationSetId(d.Id())),
} }
log.Printf("[DEBUG] Deleting Route53 reusable delegation set: %#v", input) log.Printf("[DEBUG] Deleting Route53 reusable delegation set: %#v", input)
_, err := r53.DeleteReusableDelegationSet(input) _, err := r53.DeleteReusableDelegationSet(input)

10
builtin/providers/aws/resource_aws_route53_delegation_set_test.go
View File

@ -58,7 +58,7 @@ func testAccCheckRoute53DelegationSetDestroy(s *terraform.State, provider *schem
continue continue
} }
_, err := conn.GetReusableDelegationSet(&route53.GetReusableDelegationSetInput{ID: aws.String(rs.Primary.ID)}) _, err := conn.GetReusableDelegationSet(&route53.GetReusableDelegationSetInput{Id: aws.String(rs.Primary.ID)})
if err == nil { if err == nil {
return fmt.Errorf("Delegation set still exists") return fmt.Errorf("Delegation set still exists")
} }
@ -79,14 +79,14 @@ func testAccCheckRoute53DelegationSetExists(n string) resource.TestCheckFunc {
} }
out, err := conn.GetReusableDelegationSet(&route53.GetReusableDelegationSetInput{ out, err := conn.GetReusableDelegationSet(&route53.GetReusableDelegationSetInput{
ID: aws.String(rs.Primary.ID), Id: aws.String(rs.Primary.ID),
}) })
if err != nil { if err != nil {
return fmt.Errorf("Delegation set does not exist: %#v", rs.Primary.ID) return fmt.Errorf("Delegation set does not exist: %#v", rs.Primary.ID)
} }
setID := cleanDelegationSetId(*out.DelegationSet.ID) setID := cleanDelegationSetId(*out.DelegationSet.Id)
if setID != rs.Primary.ID { if setID != rs.Primary.ID {
return fmt.Errorf("Delegation set ID does not match:\nExpected: %#v\nReturned: %#v", rs.Primary.ID, setID) return fmt.Errorf("Delegation set ID does not match:\nExpected: %#v\nReturned: %#v", rs.Primary.ID, setID)
} }
@ -104,7 +104,7 @@ func testAccCheckRoute53NameServersMatch(delegationSetName, zoneName string) res
return fmt.Errorf("Not found: %s", delegationSetName) return fmt.Errorf("Not found: %s", delegationSetName)
} }
delegationSet, err := conn.GetReusableDelegationSet(&route53.GetReusableDelegationSetInput{ delegationSet, err := conn.GetReusableDelegationSet(&route53.GetReusableDelegationSetInput{
ID: aws.String(delegationSetLocal.Primary.ID), Id: aws.String(delegationSetLocal.Primary.ID),
}) })
if err != nil { if err != nil {
return fmt.Errorf("Delegation set does not exist: %#v", delegationSetLocal.Primary.ID) return fmt.Errorf("Delegation set does not exist: %#v", delegationSetLocal.Primary.ID)
@ -115,7 +115,7 @@ func testAccCheckRoute53NameServersMatch(delegationSetName, zoneName string) res
return fmt.Errorf("Not found: %s", zoneName) return fmt.Errorf("Not found: %s", zoneName)
} }
hostedZone, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ hostedZone, err := conn.GetHostedZone(&route53.GetHostedZoneInput{
ID: aws.String(hostedZoneLocal.Primary.ID), Id: aws.String(hostedZoneLocal.Primary.ID),
}) })
if err != nil { if err != nil {
return fmt.Errorf("Delegation set does not exist: %#v", hostedZoneLocal.Primary.ID) return fmt.Errorf("Delegation set does not exist: %#v", hostedZoneLocal.Primary.ID)

10
builtin/providers/aws/resource_aws_route53_health_check.go
View File

@ -64,7 +64,7 @@ func resourceAwsRoute53HealthCheckUpdate(d *schema.ResourceData, meta interface{
conn := meta.(*AWSClient).r53conn conn := meta.(*AWSClient).r53conn
updateHealthCheck := &route53.UpdateHealthCheckInput{ updateHealthCheck := &route53.UpdateHealthCheckInput{
HealthCheckID: aws.String(d.Id()), HealthCheckId: aws.String(d.Id()),
} }
if d.HasChange("failure_threshold") { if d.HasChange("failure_threshold") {
@ -139,7 +139,7 @@ func resourceAwsRoute53HealthCheckCreate(d *schema.ResourceData, meta interface{
return err return err
} }
d.SetId(*resp.HealthCheck.ID) d.SetId(*resp.HealthCheck.Id)
if err := setTagsR53(conn, d, "healthcheck"); err != nil { if err := setTagsR53(conn, d, "healthcheck"); err != nil {
return err return err
@ -151,7 +151,7 @@ func resourceAwsRoute53HealthCheckCreate(d *schema.ResourceData, meta interface{
func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).r53conn conn := meta.(*AWSClient).r53conn
read, err := conn.GetHealthCheck(&route53.GetHealthCheckInput{HealthCheckID: aws.String(d.Id())}) read, err := conn.GetHealthCheck(&route53.GetHealthCheckInput{HealthCheckId: aws.String(d.Id())})
if err != nil { if err != nil {
if r53err, ok := err.(awserr.Error); ok && r53err.Code() == "NoSuchHealthCheck" { if r53err, ok := err.(awserr.Error); ok && r53err.Code() == "NoSuchHealthCheck" {
d.SetId("") d.SetId("")
@ -177,7 +177,7 @@ func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{})
// read the tags // read the tags
req := &route53.ListTagsForResourceInput{ req := &route53.ListTagsForResourceInput{
ResourceID: aws.String(d.Id()), ResourceId: aws.String(d.Id()),
ResourceType: aws.String("healthcheck"), ResourceType: aws.String("healthcheck"),
} }
@ -202,7 +202,7 @@ func resourceAwsRoute53HealthCheckDelete(d *schema.ResourceData, meta interface{
conn := meta.(*AWSClient).r53conn conn := meta.(*AWSClient).r53conn
log.Printf("[DEBUG] Deleteing Route53 health check: %s", d.Id()) log.Printf("[DEBUG] Deleteing Route53 health check: %s", d.Id())
_, err := conn.DeleteHealthCheck(&route53.DeleteHealthCheckInput{HealthCheckID: aws.String(d.Id())}) _, err := conn.DeleteHealthCheck(&route53.DeleteHealthCheckInput{HealthCheckId: aws.String(d.Id())})
if err != nil { if err != nil {
return err return err
} }

4
builtin/providers/aws/resource_aws_route53_health_check_test.go
View File

@ -68,7 +68,7 @@ func testAccCheckRoute53HealthCheckDestroy(s *terraform.State) error {
} }
for _, check := range resp.HealthChecks { for _, check := range resp.HealthChecks {
if *check.ID == rs.Primary.ID { if *check.Id == rs.Primary.ID {
return fmt.Errorf("Record still exists: %#v", check) return fmt.Errorf("Record still exists: %#v", check)
} }
@ -103,7 +103,7 @@ func testAccCheckRoute53HealthCheckExists(n string) resource.TestCheckFunc {
} }
for _, check := range resp.HealthChecks { for _, check := range resp.HealthChecks {
if *check.ID == rs.Primary.ID { if *check.Id == rs.Primary.ID {
return nil return nil
} }

20
builtin/providers/aws/resource_aws_route53_record.go
View File

@ -128,7 +128,7 @@ func resourceAwsRoute53RecordCreate(d *schema.ResourceData, meta interface{}) er
zone := cleanZoneID(d.Get("zone_id").(string)) zone := cleanZoneID(d.Get("zone_id").(string))
var err error var err error
zoneRecord, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(zone)}) zoneRecord, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(zone)})
if err != nil { if err != nil {
return err return err
} }
@ -153,7 +153,7 @@ func resourceAwsRoute53RecordCreate(d *schema.ResourceData, meta interface{}) er
} }
req := &route53.ChangeResourceRecordSetsInput{ req := &route53.ChangeResourceRecordSetsInput{
HostedZoneID: aws.String(cleanZoneID(*zoneRecord.HostedZone.ID)), HostedZoneId: aws.String(cleanZoneID(*zoneRecord.HostedZone.Id)),
ChangeBatch: changeBatch, ChangeBatch: changeBatch,
} }
@ -209,7 +209,7 @@ func resourceAwsRoute53RecordCreate(d *schema.ResourceData, meta interface{}) er
MinTimeout: 5 * time.Second, MinTimeout: 5 * time.Second,
Refresh: func() (result interface{}, state string, err error) { Refresh: func() (result interface{}, state string, err error) {
changeRequest := &route53.GetChangeInput{ changeRequest := &route53.GetChangeInput{
ID: aws.String(cleanChangeID(*changeInfo.ID)), Id: aws.String(cleanChangeID(*changeInfo.Id)),
} }
return resourceAwsGoRoute53Wait(conn, changeRequest) return resourceAwsGoRoute53Wait(conn, changeRequest)
}, },
@ -228,7 +228,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro
zone := cleanZoneID(d.Get("zone_id").(string)) zone := cleanZoneID(d.Get("zone_id").(string))
// get expanded name // get expanded name
zoneRecord, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(zone)}) zoneRecord, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(zone)})
if err != nil { if err != nil {
return err return err
} }
@ -237,7 +237,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro
d.Set("fqdn", en) d.Set("fqdn", en)
lopts := &route53.ListResourceRecordSetsInput{ lopts := &route53.ListResourceRecordSetsInput{
HostedZoneID: aws.String(cleanZoneID(zone)), HostedZoneId: aws.String(cleanZoneID(zone)),
StartRecordName: aws.String(en), StartRecordName: aws.String(en),
StartRecordType: aws.String(d.Get("type").(string)), StartRecordType: aws.String(d.Get("type").(string)),
} }
@ -273,7 +273,7 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro
d.Set("weight", record.Weight) d.Set("weight", record.Weight)
d.Set("set_identifier", record.SetIdentifier) d.Set("set_identifier", record.SetIdentifier)
d.Set("failover", record.Failover) d.Set("failover", record.Failover)
d.Set("health_check_id", record.HealthCheckID) d.Set("health_check_id", record.HealthCheckId)
break break
} }
@ -292,7 +292,7 @@ func resourceAwsRoute53RecordDelete(d *schema.ResourceData, meta interface{}) er
log.Printf("[DEBUG] Deleting resource records for zone: %s, name: %s", log.Printf("[DEBUG] Deleting resource records for zone: %s, name: %s",
zone, d.Get("name").(string)) zone, d.Get("name").(string))
var err error var err error
zoneRecord, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(zone)}) zoneRecord, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(zone)})
if err != nil { if err != nil {
return err return err
} }
@ -314,7 +314,7 @@ func resourceAwsRoute53RecordDelete(d *schema.ResourceData, meta interface{}) er
} }
req := &route53.ChangeResourceRecordSetsInput{ req := &route53.ChangeResourceRecordSetsInput{
HostedZoneID: aws.String(cleanZoneID(zone)), HostedZoneId: aws.String(cleanZoneID(zone)),
ChangeBatch: changeBatch, ChangeBatch: changeBatch,
} }
@ -386,7 +386,7 @@ func resourceAwsRoute53RecordBuildSet(d *schema.ResourceData, zoneName string) (
rec.AliasTarget = &route53.AliasTarget{ rec.AliasTarget = &route53.AliasTarget{
DNSName: aws.String(alias["name"].(string)), DNSName: aws.String(alias["name"].(string)),
EvaluateTargetHealth: aws.Bool(alias["evaluate_target_health"].(bool)), EvaluateTargetHealth: aws.Bool(alias["evaluate_target_health"].(bool)),
HostedZoneID: aws.String(alias["zone_id"].(string)), HostedZoneId: aws.String(alias["zone_id"].(string)),
} }
log.Printf("[DEBUG] Creating alias: %#v", alias) log.Printf("[DEBUG] Creating alias: %#v", alias)
} else { } else {
@ -404,7 +404,7 @@ func resourceAwsRoute53RecordBuildSet(d *schema.ResourceData, zoneName string) (
} }
if v, ok := d.GetOk("health_check_id"); ok { if v, ok := d.GetOk("health_check_id"); ok {
rec.HealthCheckID = aws.String(v.(string)) rec.HealthCheckId = aws.String(v.(string))
} }
if v, ok := d.GetOk("weight"); ok { if v, ok := d.GetOk("weight"); ok {

4
builtin/providers/aws/resource_aws_route53_record_test.go
View File

@ -235,7 +235,7 @@ func testAccCheckRoute53RecordDestroy(s *terraform.State) error {
rType := parts[2] rType := parts[2]
lopts := &route53.ListResourceRecordSetsInput{ lopts := &route53.ListResourceRecordSetsInput{
HostedZoneID: aws.String(cleanZoneID(zone)), HostedZoneId: aws.String(cleanZoneID(zone)),
StartRecordName: aws.String(name), StartRecordName: aws.String(name),
StartRecordType: aws.String(rType), StartRecordType: aws.String(rType),
} }
@ -275,7 +275,7 @@ func testAccCheckRoute53RecordExists(n string) resource.TestCheckFunc {
en := expandRecordName(name, "notexample.com") en := expandRecordName(name, "notexample.com")
lopts := &route53.ListResourceRecordSetsInput{ lopts := &route53.ListResourceRecordSetsInput{
HostedZoneID: aws.String(cleanZoneID(zone)), HostedZoneId: aws.String(cleanZoneID(zone)),
StartRecordName: aws.String(en), StartRecordName: aws.String(en),
StartRecordType: aws.String(rType), StartRecordType: aws.String(rType),
} }

22
builtin/providers/aws/resource_aws_route53_zone.go
View File

@ -80,7 +80,7 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro
} }
if v := d.Get("vpc_id"); v != "" { if v := d.Get("vpc_id"); v != "" {
req.VPC = &route53.VPC{ req.VPC = &route53.VPC{
VPCID: aws.String(v.(string)), VPCId: aws.String(v.(string)),
VPCRegion: aws.String(meta.(*AWSClient).region), VPCRegion: aws.String(meta.(*AWSClient).region),
} }
if w := d.Get("vpc_region"); w != "" { if w := d.Get("vpc_region"); w != "" {
@ -90,7 +90,7 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro
} }
if v, ok := d.GetOk("delegation_set_id"); ok { if v, ok := d.GetOk("delegation_set_id"); ok {
req.DelegationSetID = aws.String(v.(string)) req.DelegationSetId = aws.String(v.(string))
} }
log.Printf("[DEBUG] Creating Route53 hosted zone: %s", *req.Name) log.Printf("[DEBUG] Creating Route53 hosted zone: %s", *req.Name)
@ -101,7 +101,7 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro
} }
// Store the zone_id // Store the zone_id
zone := cleanZoneID(*resp.HostedZone.ID) zone := cleanZoneID(*resp.HostedZone.Id)
d.Set("zone_id", zone) d.Set("zone_id", zone)
d.SetId(zone) d.SetId(zone)
@ -114,7 +114,7 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro
MinTimeout: 2 * time.Second, MinTimeout: 2 * time.Second,
Refresh: func() (result interface{}, state string, err error) { Refresh: func() (result interface{}, state string, err error) {
changeRequest := &route53.GetChangeInput{ changeRequest := &route53.GetChangeInput{
ID: aws.String(cleanChangeID(*resp.ChangeInfo.ID)), Id: aws.String(cleanChangeID(*resp.ChangeInfo.Id)),
} }
return resourceAwsGoRoute53Wait(r53, changeRequest) return resourceAwsGoRoute53Wait(r53, changeRequest)
}, },
@ -128,7 +128,7 @@ func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) erro
func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error {
r53 := meta.(*AWSClient).r53conn r53 := meta.(*AWSClient).r53conn
zone, err := r53.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(d.Id())}) zone, err := r53.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(d.Id())})
if err != nil { if err != nil {
// Handle a deleted zone // Handle a deleted zone
if r53err, ok := err.(awserr.Error); ok && r53err.Code() == "NoSuchHostedZone" { if r53err, ok := err.(awserr.Error); ok && r53err.Code() == "NoSuchHostedZone" {
@ -158,7 +158,7 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error
var associatedVPC *route53.VPC var associatedVPC *route53.VPC
for _, vpc := range zone.VPCs { for _, vpc := range zone.VPCs {
if *vpc.VPCID == d.Get("vpc_id") { if *vpc.VPCId == d.Get("vpc_id") {
associatedVPC = vpc associatedVPC = vpc
} }
} }
@ -167,13 +167,13 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error
} }
} }
if zone.DelegationSet != nil && zone.DelegationSet.ID != nil { if zone.DelegationSet != nil && zone.DelegationSet.Id != nil {
d.Set("delegation_set_id", cleanDelegationSetId(*zone.DelegationSet.ID)) d.Set("delegation_set_id", cleanDelegationSetId(*zone.DelegationSet.Id))
} }
// get tags // get tags
req := &route53.ListTagsForResourceInput{ req := &route53.ListTagsForResourceInput{
ResourceID: aws.String(d.Id()), ResourceId: aws.String(d.Id()),
ResourceType: aws.String("hostedzone"), ResourceType: aws.String("hostedzone"),
} }
@ -211,7 +211,7 @@ func resourceAwsRoute53ZoneDelete(d *schema.ResourceData, meta interface{}) erro
log.Printf("[DEBUG] Deleting Route53 hosted zone: %s (ID: %s)", log.Printf("[DEBUG] Deleting Route53 hosted zone: %s (ID: %s)",
d.Get("name").(string), d.Id()) d.Get("name").(string), d.Id())
_, err := r53.DeleteHostedZone(&route53.DeleteHostedZoneInput{ID: aws.String(d.Id())}) _, err := r53.DeleteHostedZone(&route53.DeleteHostedZoneInput{Id: aws.String(d.Id())})
if err != nil { if err != nil {
return err return err
} }
@ -248,7 +248,7 @@ func cleanPrefix(ID, prefix string) string {
func getNameServers(zoneId string, zoneName string, r53 *route53.Route53) ([]string, error) { func getNameServers(zoneId string, zoneName string, r53 *route53.Route53) ([]string, error) {
resp, err := r53.ListResourceRecordSets(&route53.ListResourceRecordSetsInput{ resp, err := r53.ListResourceRecordSets(&route53.ListResourceRecordSetsInput{
HostedZoneID: aws.String(zoneId), HostedZoneId: aws.String(zoneId),
StartRecordName: aws.String(zoneName), StartRecordName: aws.String(zoneName),
StartRecordType: aws.String("NS"), StartRecordType: aws.String("NS"),
}) })

18
builtin/providers/aws/resource_aws_route53_zone_association.go
View File

@ -45,9 +45,9 @@ func resourceAwsRoute53ZoneAssociationCreate(d *schema.ResourceData, meta interf
r53 := meta.(*AWSClient).r53conn r53 := meta.(*AWSClient).r53conn
req := &route53.AssociateVPCWithHostedZoneInput{ req := &route53.AssociateVPCWithHostedZoneInput{
HostedZoneID: aws.String(d.Get("zone_id").(string)), HostedZoneId: aws.String(d.Get("zone_id").(string)),
VPC: &route53.VPC{ VPC: &route53.VPC{
VPCID: aws.String(d.Get("vpc_id").(string)), VPCId: aws.String(d.Get("vpc_id").(string)),
VPCRegion: aws.String(meta.(*AWSClient).region), VPCRegion: aws.String(meta.(*AWSClient).region),
}, },
Comment: aws.String("Managed by Terraform"), Comment: aws.String("Managed by Terraform"),
@ -56,7 +56,7 @@ func resourceAwsRoute53ZoneAssociationCreate(d *schema.ResourceData, meta interf
req.VPC.VPCRegion = aws.String(w.(string)) req.VPC.VPCRegion = aws.String(w.(string))
} }
log.Printf("[DEBUG] Associating Route53 Private Zone %s with VPC %s with region %s", *req.HostedZoneID, *req.VPC.VPCID, *req.VPC.VPCRegion) log.Printf("[DEBUG] Associating Route53 Private Zone %s with VPC %s with region %s", *req.HostedZoneId, *req.VPC.VPCId, *req.VPC.VPCRegion)
var err error var err error
resp, err := r53.AssociateVPCWithHostedZone(req) resp, err := r53.AssociateVPCWithHostedZone(req)
if err != nil { if err != nil {
@ -64,7 +64,7 @@ func resourceAwsRoute53ZoneAssociationCreate(d *schema.ResourceData, meta interf
} }
// Store association id // Store association id
d.SetId(fmt.Sprintf("%s:%s", *req.HostedZoneID, *req.VPC.VPCID)) d.SetId(fmt.Sprintf("%s:%s", *req.HostedZoneId, *req.VPC.VPCId))
d.Set("vpc_region", req.VPC.VPCRegion) d.Set("vpc_region", req.VPC.VPCRegion)
// Wait until we are done initializing // Wait until we are done initializing
@ -76,7 +76,7 @@ func resourceAwsRoute53ZoneAssociationCreate(d *schema.ResourceData, meta interf
MinTimeout: 2 * time.Second, MinTimeout: 2 * time.Second,
Refresh: func() (result interface{}, state string, err error) { Refresh: func() (result interface{}, state string, err error) {
changeRequest := &route53.GetChangeInput{ changeRequest := &route53.GetChangeInput{
ID: aws.String(cleanChangeID(*resp.ChangeInfo.ID)), Id: aws.String(cleanChangeID(*resp.ChangeInfo.Id)),
} }
return resourceAwsGoRoute53Wait(r53, changeRequest) return resourceAwsGoRoute53Wait(r53, changeRequest)
}, },
@ -92,7 +92,7 @@ func resourceAwsRoute53ZoneAssociationCreate(d *schema.ResourceData, meta interf
func resourceAwsRoute53ZoneAssociationRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsRoute53ZoneAssociationRead(d *schema.ResourceData, meta interface{}) error {
r53 := meta.(*AWSClient).r53conn r53 := meta.(*AWSClient).r53conn
zone_id, vpc_id := resourceAwsRoute53ZoneAssociationParseId(d.Id()) zone_id, vpc_id := resourceAwsRoute53ZoneAssociationParseId(d.Id())
zone, err := r53.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(zone_id)}) zone, err := r53.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(zone_id)})
if err != nil { if err != nil {
// Handle a deleted zone // Handle a deleted zone
if r53err, ok := err.(awserr.Error); ok && r53err.Code() == "NoSuchHostedZone" { if r53err, ok := err.(awserr.Error); ok && r53err.Code() == "NoSuchHostedZone" {
@ -103,7 +103,7 @@ func resourceAwsRoute53ZoneAssociationRead(d *schema.ResourceData, meta interfac
} }
for _, vpc := range zone.VPCs { for _, vpc := range zone.VPCs {
if vpc_id == *vpc.VPCID { if vpc_id == *vpc.VPCId {
// association is there, return // association is there, return
return nil return nil
} }
@ -125,9 +125,9 @@ func resourceAwsRoute53ZoneAssociationDelete(d *schema.ResourceData, meta interf
zone_id, vpc_id) zone_id, vpc_id)
req := &route53.DisassociateVPCFromHostedZoneInput{ req := &route53.DisassociateVPCFromHostedZoneInput{
HostedZoneID: aws.String(zone_id), HostedZoneId: aws.String(zone_id),
VPC: &route53.VPC{ VPC: &route53.VPC{
VPCID: aws.String(vpc_id), VPCId: aws.String(vpc_id),
VPCRegion: aws.String(d.Get("vpc_region").(string)), VPCRegion: aws.String(d.Get("vpc_region").(string)),
}, },
Comment: aws.String("Managed by Terraform"), Comment: aws.String("Managed by Terraform"),

8
builtin/providers/aws/resource_aws_route53_zone_association_test.go
View File

@ -86,11 +86,11 @@ func testAccCheckRoute53ZoneAssociationDestroyWithProvider(s *terraform.State, p
zone_id, vpc_id := resourceAwsRoute53ZoneAssociationParseId(rs.Primary.ID) zone_id, vpc_id := resourceAwsRoute53ZoneAssociationParseId(rs.Primary.ID)
resp, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(zone_id)}) resp, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(zone_id)})
if err != nil { if err != nil {
exists := false exists := false
for _, vpc := range resp.VPCs { for _, vpc := range resp.VPCs {
if vpc_id == *vpc.VPCID { if vpc_id == *vpc.VPCId {
exists = true exists = true
} }
} }
@ -135,14 +135,14 @@ func testAccCheckRoute53ZoneAssociationExistsWithProvider(s *terraform.State, n
zone_id, vpc_id := resourceAwsRoute53ZoneAssociationParseId(rs.Primary.ID) zone_id, vpc_id := resourceAwsRoute53ZoneAssociationParseId(rs.Primary.ID)
conn := provider.Meta().(*AWSClient).r53conn conn := provider.Meta().(*AWSClient).r53conn
resp, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(zone_id)}) resp, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(zone_id)})
if err != nil { if err != nil {
return fmt.Errorf("Hosted zone err: %v", err) return fmt.Errorf("Hosted zone err: %v", err)
} }
exists := false exists := false
for _, vpc := range resp.VPCs { for _, vpc := range resp.VPCs {
if vpc_id == *vpc.VPCID { if vpc_id == *vpc.VPCId {
exists = true exists = true
} }
} }

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

@ -159,7 +159,7 @@ func testAccCheckRoute53ZoneDestroyWithProvider(s *terraform.State, provider *sc
continue continue
} }
_, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(rs.Primary.ID)}) _, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(rs.Primary.ID)})
if err == nil { if err == nil {
return fmt.Errorf("Hosted zone still exists") return fmt.Errorf("Hosted zone still exists")
} }
@ -198,7 +198,7 @@ func testAccCheckRoute53ZoneExistsWithProvider(s *terraform.State, n string, zon
} }
conn := provider.Meta().(*AWSClient).r53conn conn := provider.Meta().(*AWSClient).r53conn
resp, err := conn.GetHostedZone(&route53.GetHostedZoneInput{ID: aws.String(rs.Primary.ID)}) resp, err := conn.GetHostedZone(&route53.GetHostedZoneInput{Id: aws.String(rs.Primary.ID)})
if err != nil { if err != nil {
return fmt.Errorf("Hosted zone err: %v", err) return fmt.Errorf("Hosted zone err: %v", err)
} }
@ -241,12 +241,12 @@ func testAccCheckRoute53ZoneAssociatesWithVpc(n string, zone *route53.GetHostedZ
var associatedVPC *route53.VPC var associatedVPC *route53.VPC
for _, vpc := range zone.VPCs { for _, vpc := range zone.VPCs {
if *vpc.VPCID == rs.Primary.ID { if *vpc.VPCId == rs.Primary.ID {
associatedVPC = vpc associatedVPC = vpc
} }
} }
if associatedVPC == nil { if associatedVPC == nil {
return fmt.Errorf("VPC: %v is not associated to Zone: %v", n, cleanZoneID(*zone.HostedZone.ID)) return fmt.Errorf("VPC: %v is not associated to Zone: %v", n, cleanZoneID(*zone.HostedZone.Id))
} }
return nil return nil
} }
@ -256,9 +256,9 @@ func testAccLoadTagsR53(zone *route53.GetHostedZoneOutput, td *route53.ResourceT
return func(s *terraform.State) error { return func(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).r53conn conn := testAccProvider.Meta().(*AWSClient).r53conn
zone := cleanZoneID(*zone.HostedZone.ID) zone := cleanZoneID(*zone.HostedZone.Id)
req := &route53.ListTagsForResourceInput{ req := &route53.ListTagsForResourceInput{
ResourceID: aws.String(zone), ResourceId: aws.String(zone),
ResourceType: aws.String("hostedzone"), ResourceType: aws.String("hostedzone"),
} }

72
builtin/providers/aws/resource_aws_route_table.go
View File

@ -81,7 +81,7 @@ func resourceAwsRouteTableCreate(d *schema.ResourceData, meta interface{}) error
// Create the routing table // Create the routing table
createOpts := &ec2.CreateRouteTableInput{ createOpts := &ec2.CreateRouteTableInput{
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
} }
log.Printf("[DEBUG] RouteTable create config: %#v", createOpts) log.Printf("[DEBUG] RouteTable create config: %#v", createOpts)
@ -92,7 +92,7 @@ func resourceAwsRouteTableCreate(d *schema.ResourceData, meta interface{}) error
// Get the ID and store it // Get the ID and store it
rt := resp.RouteTable rt := resp.RouteTable
d.SetId(*rt.RouteTableID) d.SetId(*rt.RouteTableId)
log.Printf("[INFO] Route Table ID: %s", d.Id()) log.Printf("[INFO] Route Table ID: %s", d.Id())
// Wait for the route table to become available // Wait for the route table to become available
@ -127,11 +127,11 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error {
} }
rt := rtRaw.(*ec2.RouteTable) rt := rtRaw.(*ec2.RouteTable)
d.Set("vpc_id", rt.VPCID) d.Set("vpc_id", rt.VpcId)
propagatingVGWs := make([]string, 0, len(rt.PropagatingVGWs)) propagatingVGWs := make([]string, 0, len(rt.PropagatingVgws))
for _, vgw := range rt.PropagatingVGWs { for _, vgw := range rt.PropagatingVgws {
propagatingVGWs = append(propagatingVGWs, *vgw.GatewayID) propagatingVGWs = append(propagatingVGWs, *vgw.GatewayId)
} }
d.Set("propagating_vgws", propagatingVGWs) d.Set("propagating_vgws", propagatingVGWs)
@ -140,7 +140,7 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error {
// Loop through the routes and add them to the set // Loop through the routes and add them to the set
for _, r := range rt.Routes { for _, r := range rt.Routes {
if r.GatewayID != nil && *r.GatewayID == "local" { if r.GatewayId != nil && *r.GatewayId == "local" {
continue continue
} }
@ -148,7 +148,7 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error {
continue continue
} }
if r.DestinationPrefixListID != nil { if r.DestinationPrefixListId != nil {
// Skipping because VPC endpoint routes are handled separately // Skipping because VPC endpoint routes are handled separately
// See aws_vpc_endpoint // See aws_vpc_endpoint
continue continue
@ -156,20 +156,20 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error {
m := make(map[string]interface{}) m := make(map[string]interface{})
if r.DestinationCIDRBlock != nil { if r.DestinationCidrBlock != nil {
m["cidr_block"] = *r.DestinationCIDRBlock m["cidr_block"] = *r.DestinationCidrBlock
} }
if r.GatewayID != nil { if r.GatewayId != nil {
m["gateway_id"] = *r.GatewayID m["gateway_id"] = *r.GatewayId
} }
if r.InstanceID != nil { if r.InstanceId != nil {
m["instance_id"] = *r.InstanceID m["instance_id"] = *r.InstanceId
} }
if r.VPCPeeringConnectionID != nil { if r.VpcPeeringConnectionId != nil {
m["vpc_peering_connection_id"] = *r.VPCPeeringConnectionID m["vpc_peering_connection_id"] = *r.VpcPeeringConnectionId
} }
if r.NetworkInterfaceID != nil { if r.NetworkInterfaceId != nil {
m["network_interface_id"] = *r.NetworkInterfaceID m["network_interface_id"] = *r.NetworkInterfaceId
} }
route.Add(m) route.Add(m)
@ -200,9 +200,9 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error
log.Printf( log.Printf(
"[INFO] Deleting VGW propagation from %s: %s", "[INFO] Deleting VGW propagation from %s: %s",
d.Id(), id) d.Id(), id)
_, err := conn.DisableVGWRoutePropagation(&ec2.DisableVGWRoutePropagationInput{ _, err := conn.DisableVgwRoutePropagation(&ec2.DisableVgwRoutePropagationInput{
RouteTableID: aws.String(d.Id()), RouteTableId: aws.String(d.Id()),
GatewayID: aws.String(id), GatewayId: aws.String(id),
}) })
if err != nil { if err != nil {
return err return err
@ -220,9 +220,9 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error
var err error var err error
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
log.Printf("[INFO] Enabling VGW propagation for %s: %s", d.Id(), id) log.Printf("[INFO] Enabling VGW propagation for %s: %s", d.Id(), id)
_, err = conn.EnableVGWRoutePropagation(&ec2.EnableVGWRoutePropagationInput{ _, err = conn.EnableVgwRoutePropagation(&ec2.EnableVgwRoutePropagationInput{
RouteTableID: aws.String(d.Id()), RouteTableId: aws.String(d.Id()),
GatewayID: aws.String(id), GatewayId: aws.String(id),
}) })
if err == nil { if err == nil {
break break
@ -261,8 +261,8 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error
"[INFO] Deleting route from %s: %s", "[INFO] Deleting route from %s: %s",
d.Id(), m["cidr_block"].(string)) d.Id(), m["cidr_block"].(string))
_, err := conn.DeleteRoute(&ec2.DeleteRouteInput{ _, err := conn.DeleteRoute(&ec2.DeleteRouteInput{
RouteTableID: aws.String(d.Id()), RouteTableId: aws.String(d.Id()),
DestinationCIDRBlock: aws.String(m["cidr_block"].(string)), DestinationCidrBlock: aws.String(m["cidr_block"].(string)),
}) })
if err != nil { if err != nil {
return err return err
@ -278,12 +278,12 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error
m := route.(map[string]interface{}) m := route.(map[string]interface{})
opts := ec2.CreateRouteInput{ opts := ec2.CreateRouteInput{
RouteTableID: aws.String(d.Id()), RouteTableId: aws.String(d.Id()),
DestinationCIDRBlock: aws.String(m["cidr_block"].(string)), DestinationCidrBlock: aws.String(m["cidr_block"].(string)),
GatewayID: aws.String(m["gateway_id"].(string)), GatewayId: aws.String(m["gateway_id"].(string)),
InstanceID: aws.String(m["instance_id"].(string)), InstanceId: aws.String(m["instance_id"].(string)),
VPCPeeringConnectionID: aws.String(m["vpc_peering_connection_id"].(string)), VpcPeeringConnectionId: aws.String(m["vpc_peering_connection_id"].(string)),
NetworkInterfaceID: aws.String(m["network_interface_id"].(string)), NetworkInterfaceId: aws.String(m["network_interface_id"].(string)),
} }
log.Printf("[INFO] Creating route for %s: %#v", d.Id(), opts) log.Printf("[INFO] Creating route for %s: %#v", d.Id(), opts)
@ -321,9 +321,9 @@ func resourceAwsRouteTableDelete(d *schema.ResourceData, meta interface{}) error
// Do all the disassociations // Do all the disassociations
for _, a := range rt.Associations { for _, a := range rt.Associations {
log.Printf("[INFO] Disassociating association: %s", *a.RouteTableAssociationID) log.Printf("[INFO] Disassociating association: %s", *a.RouteTableAssociationId)
_, err := conn.DisassociateRouteTable(&ec2.DisassociateRouteTableInput{ _, err := conn.DisassociateRouteTable(&ec2.DisassociateRouteTableInput{
AssociationID: a.RouteTableAssociationID, AssociationId: a.RouteTableAssociationId,
}) })
if err != nil { if err != nil {
return err return err
@ -333,7 +333,7 @@ func resourceAwsRouteTableDelete(d *schema.ResourceData, meta interface{}) error
// Delete the route table // Delete the route table
log.Printf("[INFO] Deleting Route Table: %s", d.Id()) log.Printf("[INFO] Deleting Route Table: %s", d.Id())
_, err = conn.DeleteRouteTable(&ec2.DeleteRouteTableInput{ _, err = conn.DeleteRouteTable(&ec2.DeleteRouteTableInput{
RouteTableID: aws.String(d.Id()), RouteTableId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)
@ -398,7 +398,7 @@ func resourceAwsRouteTableHash(v interface{}) int {
func resourceAwsRouteTableStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func resourceAwsRouteTableStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{ resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{
RouteTableIDs: []*string{aws.String(id)}, RouteTableIds: []*string{aws.String(id)},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidRouteTableID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidRouteTableID.NotFound" {

18
builtin/providers/aws/resource_aws_route_table_association.go
View File

@ -41,8 +41,8 @@ func resourceAwsRouteTableAssociationCreate(d *schema.ResourceData, meta interfa
d.Get("route_table_id").(string)) d.Get("route_table_id").(string))
resp, err := conn.AssociateRouteTable(&ec2.AssociateRouteTableInput{ resp, err := conn.AssociateRouteTable(&ec2.AssociateRouteTableInput{
RouteTableID: aws.String(d.Get("route_table_id").(string)), RouteTableId: aws.String(d.Get("route_table_id").(string)),
SubnetID: aws.String(d.Get("subnet_id").(string)), SubnetId: aws.String(d.Get("subnet_id").(string)),
}) })
if err != nil { if err != nil {
@ -50,7 +50,7 @@ func resourceAwsRouteTableAssociationCreate(d *schema.ResourceData, meta interfa
} }
// Set the ID and return // Set the ID and return
d.SetId(*resp.AssociationID) d.SetId(*resp.AssociationId)
log.Printf("[INFO] Association ID: %s", d.Id()) log.Printf("[INFO] Association ID: %s", d.Id())
return nil return nil
@ -73,9 +73,9 @@ func resourceAwsRouteTableAssociationRead(d *schema.ResourceData, meta interface
// Inspect that the association exists // Inspect that the association exists
found := false found := false
for _, a := range rt.Associations { for _, a := range rt.Associations {
if *a.RouteTableAssociationID == d.Id() { if *a.RouteTableAssociationId == d.Id() {
found = true found = true
d.Set("subnet_id", *a.SubnetID) d.Set("subnet_id", *a.SubnetId)
break break
} }
} }
@ -97,8 +97,8 @@ func resourceAwsRouteTableAssociationUpdate(d *schema.ResourceData, meta interfa
d.Get("route_table_id").(string)) d.Get("route_table_id").(string))
req := &ec2.ReplaceRouteTableAssociationInput{ req := &ec2.ReplaceRouteTableAssociationInput{
AssociationID: aws.String(d.Id()), AssociationId: aws.String(d.Id()),
RouteTableID: aws.String(d.Get("route_table_id").(string)), RouteTableId: aws.String(d.Get("route_table_id").(string)),
} }
resp, err := conn.ReplaceRouteTableAssociation(req) resp, err := conn.ReplaceRouteTableAssociation(req)
@ -113,7 +113,7 @@ func resourceAwsRouteTableAssociationUpdate(d *schema.ResourceData, meta interfa
} }
// Update the ID // Update the ID
d.SetId(*resp.NewAssociationID) d.SetId(*resp.NewAssociationId)
log.Printf("[INFO] Association ID: %s", d.Id()) log.Printf("[INFO] Association ID: %s", d.Id())
return nil return nil
@ -124,7 +124,7 @@ func resourceAwsRouteTableAssociationDelete(d *schema.ResourceData, meta interfa
log.Printf("[INFO] Deleting route table association: %s", d.Id()) log.Printf("[INFO] Deleting route table association: %s", d.Id())
_, err := conn.DisassociateRouteTable(&ec2.DisassociateRouteTableInput{ _, err := conn.DisassociateRouteTable(&ec2.DisassociateRouteTableInput{
AssociationID: aws.String(d.Id()), AssociationId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)

6
builtin/providers/aws/resource_aws_route_table_association_test.go
View File

@ -48,7 +48,7 @@ func testAccCheckRouteTableAssociationDestroy(s *terraform.State) error {
// Try to find the resource // Try to find the resource
resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{ resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{
RouteTableIDs: []*string{aws.String(rs.Primary.Attributes["route_table_id"])}, RouteTableIds: []*string{aws.String(rs.Primary.Attributes["route_table_id"])},
}) })
if err != nil { if err != nil {
// Verify the error is what we want // Verify the error is what we want
@ -65,7 +65,7 @@ func testAccCheckRouteTableAssociationDestroy(s *terraform.State) error {
rt := resp.RouteTables[0] rt := resp.RouteTables[0]
if len(rt.Associations) > 0 { if len(rt.Associations) > 0 {
return fmt.Errorf( return fmt.Errorf(
"route table %s has associations", *rt.RouteTableID) "route table %s has associations", *rt.RouteTableId)
} }
} }
@ -86,7 +86,7 @@ func testAccCheckRouteTableAssociationExists(n string, v *ec2.RouteTable) resour
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{ resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{
RouteTableIDs: []*string{aws.String(rs.Primary.Attributes["route_table_id"])}, RouteTableIds: []*string{aws.String(rs.Primary.Attributes["route_table_id"])},
}) })
if err != nil { if err != nil {
return err return err

28
builtin/providers/aws/resource_aws_route_table_test.go
View File

@ -21,7 +21,7 @@ func TestAccAWSRouteTable_basic(t *testing.T) {
routes := make(map[string]*ec2.Route) routes := make(map[string]*ec2.Route)
for _, r := range v.Routes { for _, r := range v.Routes {
routes[*r.DestinationCIDRBlock] = r routes[*r.DestinationCidrBlock] = r
} }
if _, ok := routes["10.1.0.0/16"]; !ok { if _, ok := routes["10.1.0.0/16"]; !ok {
@ -41,7 +41,7 @@ func TestAccAWSRouteTable_basic(t *testing.T) {
routes := make(map[string]*ec2.Route) routes := make(map[string]*ec2.Route)
for _, r := range v.Routes { for _, r := range v.Routes {
routes[*r.DestinationCIDRBlock] = r routes[*r.DestinationCidrBlock] = r
} }
if _, ok := routes["10.1.0.0/16"]; !ok { if _, ok := routes["10.1.0.0/16"]; !ok {
@ -93,7 +93,7 @@ func TestAccAWSRouteTable_instance(t *testing.T) {
routes := make(map[string]*ec2.Route) routes := make(map[string]*ec2.Route)
for _, r := range v.Routes { for _, r := range v.Routes {
routes[*r.DestinationCIDRBlock] = r routes[*r.DestinationCidrBlock] = r
} }
if _, ok := routes["10.1.0.0/16"]; !ok { if _, ok := routes["10.1.0.0/16"]; !ok {
@ -161,7 +161,7 @@ func testAccCheckRouteTableDestroy(s *terraform.State) error {
// Try to find the resource // Try to find the resource
resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{ resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{
RouteTableIDs: []*string{aws.String(rs.Primary.ID)}, RouteTableIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.RouteTables) > 0 { if len(resp.RouteTables) > 0 {
@ -197,7 +197,7 @@ func testAccCheckRouteTableExists(n string, v *ec2.RouteTable) resource.TestChec
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{ resp, err := conn.DescribeRouteTables(&ec2.DescribeRouteTablesInput{
RouteTableIDs: []*string{aws.String(rs.Primary.ID)}, RouteTableIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err != nil { if err != nil {
return err return err
@ -225,7 +225,7 @@ func _TestAccAWSRouteTable_vpcPeering(t *testing.T) {
routes := make(map[string]*ec2.Route) routes := make(map[string]*ec2.Route)
for _, r := range v.Routes { for _, r := range v.Routes {
routes[*r.DestinationCIDRBlock] = r routes[*r.DestinationCidrBlock] = r
} }
if _, ok := routes["10.1.0.0/16"]; !ok { if _, ok := routes["10.1.0.0/16"]; !ok {
@ -256,20 +256,20 @@ func _TestAccAWSRouteTable_vpcPeering(t *testing.T) {
func TestAccAWSRouteTable_vgwRoutePropagation(t *testing.T) { func TestAccAWSRouteTable_vgwRoutePropagation(t *testing.T) {
var v ec2.RouteTable var v ec2.RouteTable
var vgw ec2.VPNGateway var vgw ec2.VpnGateway
testCheck := func(*terraform.State) error { testCheck := func(*terraform.State) error {
if len(v.PropagatingVGWs) != 1 { if len(v.PropagatingVgws) != 1 {
return fmt.Errorf("bad propagating vgws: %#v", v.PropagatingVGWs) return fmt.Errorf("bad propagating vgws: %#v", v.PropagatingVgws)
} }
propagatingVGWs := make(map[string]*ec2.PropagatingVGW) propagatingVGWs := make(map[string]*ec2.PropagatingVgw)
for _, gw := range v.PropagatingVGWs { for _, gw := range v.PropagatingVgws {
propagatingVGWs[*gw.GatewayID] = gw propagatingVGWs[*gw.GatewayId] = gw
} }
if _, ok := propagatingVGWs[*vgw.VPNGatewayID]; !ok { if _, ok := propagatingVGWs[*vgw.VpnGatewayId]; !ok {
return fmt.Errorf("bad propagating vgws: %#v", v.PropagatingVGWs) return fmt.Errorf("bad propagating vgws: %#v", v.PropagatingVgws)
} }
return nil return nil

70
builtin/providers/aws/resource_aws_security_group.go
View File

@ -168,7 +168,7 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er
securityGroupOpts := &ec2.CreateSecurityGroupInput{} securityGroupOpts := &ec2.CreateSecurityGroupInput{}
if v, ok := d.GetOk("vpc_id"); ok { if v, ok := d.GetOk("vpc_id"); ok {
securityGroupOpts.VPCID = aws.String(v.(string)) securityGroupOpts.VpcId = aws.String(v.(string))
} }
if v := d.Get("description"); v != nil { if v := d.Get("description"); v != nil {
@ -191,7 +191,7 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er
return fmt.Errorf("Error creating Security Group: %s", err) return fmt.Errorf("Error creating Security Group: %s", err)
} }
d.SetId(*createResp.GroupID) d.SetId(*createResp.GroupId)
log.Printf("[INFO] Security Group ID: %s", d.Id()) log.Printf("[INFO] Security Group ID: %s", d.Id())
@ -216,21 +216,21 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er
// AWS defaults all Security Groups to have an ALLOW ALL egress rule. Here we // AWS defaults all Security Groups to have an ALLOW ALL egress rule. Here we
// revoke that rule, so users don't unknowningly have/use it. // revoke that rule, so users don't unknowningly have/use it.
group := resp.(*ec2.SecurityGroup) group := resp.(*ec2.SecurityGroup)
if group.VPCID != nil && *group.VPCID != "" { if group.VpcId != nil && *group.VpcId != "" {
log.Printf("[DEBUG] Revoking default egress rule for Security Group for %s", d.Id()) log.Printf("[DEBUG] Revoking default egress rule for Security Group for %s", d.Id())
req := &ec2.RevokeSecurityGroupEgressInput{ req := &ec2.RevokeSecurityGroupEgressInput{
GroupID: createResp.GroupID, GroupId: createResp.GroupId,
IPPermissions: []*ec2.IPPermission{ IpPermissions: []*ec2.IpPermission{
&ec2.IPPermission{ &ec2.IpPermission{
FromPort: aws.Int64(int64(0)), FromPort: aws.Int64(int64(0)),
ToPort: aws.Int64(int64(0)), ToPort: aws.Int64(int64(0)),
IPRanges: []*ec2.IPRange{ IpRanges: []*ec2.IpRange{
&ec2.IPRange{ &ec2.IpRange{
CIDRIP: aws.String("0.0.0.0/0"), CidrIp: aws.String("0.0.0.0/0"),
}, },
}, },
IPProtocol: aws.String("-1"), IpProtocol: aws.String("-1"),
}, },
}, },
} }
@ -260,13 +260,13 @@ func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) erro
sg := sgRaw.(*ec2.SecurityGroup) sg := sgRaw.(*ec2.SecurityGroup)
ingressRules := resourceAwsSecurityGroupIPPermGather(d, sg.IPPermissions) ingressRules := resourceAwsSecurityGroupIPPermGather(d, sg.IpPermissions)
egressRules := resourceAwsSecurityGroupIPPermGather(d, sg.IPPermissionsEgress) egressRules := resourceAwsSecurityGroupIPPermGather(d, sg.IpPermissionsEgress)
d.Set("description", sg.Description) d.Set("description", sg.Description)
d.Set("name", sg.GroupName) d.Set("name", sg.GroupName)
d.Set("vpc_id", sg.VPCID) d.Set("vpc_id", sg.VpcId)
d.Set("owner_id", sg.OwnerID) d.Set("owner_id", sg.OwnerId)
d.Set("ingress", ingressRules) d.Set("ingress", ingressRules)
d.Set("egress", egressRules) d.Set("egress", egressRules)
d.Set("tags", tagsToMap(sg.Tags)) d.Set("tags", tagsToMap(sg.Tags))
@ -315,7 +315,7 @@ func resourceAwsSecurityGroupDelete(d *schema.ResourceData, meta interface{}) er
return resource.Retry(5*time.Minute, func() error { return resource.Retry(5*time.Minute, func() error {
_, err := conn.DeleteSecurityGroup(&ec2.DeleteSecurityGroupInput{ _, err := conn.DeleteSecurityGroup(&ec2.DeleteSecurityGroupInput{
GroupID: aws.String(d.Id()), GroupId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)
@ -377,7 +377,7 @@ func resourceAwsSecurityGroupRuleHash(v interface{}) int {
return hashcode.String(buf.String()) return hashcode.String(buf.String())
} }
func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []*ec2.IPPermission) []map[string]interface{} { func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []*ec2.IpPermission) []map[string]interface{} {
ruleMap := make(map[string]map[string]interface{}) ruleMap := make(map[string]map[string]interface{})
for _, perm := range permissions { for _, perm := range permissions {
var fromPort, toPort int64 var fromPort, toPort int64
@ -388,7 +388,7 @@ func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []
toPort = *v toPort = *v
} }
k := fmt.Sprintf("%s-%d-%d", *perm.IPProtocol, fromPort, toPort) k := fmt.Sprintf("%s-%d-%d", *perm.IpProtocol, fromPort, toPort)
m, ok := ruleMap[k] m, ok := ruleMap[k]
if !ok { if !ok {
m = make(map[string]interface{}) m = make(map[string]interface{})
@ -397,25 +397,25 @@ func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []
m["from_port"] = fromPort m["from_port"] = fromPort
m["to_port"] = toPort m["to_port"] = toPort
m["protocol"] = *perm.IPProtocol m["protocol"] = *perm.IpProtocol
if len(perm.IPRanges) > 0 { if len(perm.IpRanges) > 0 {
raw, ok := m["cidr_blocks"] raw, ok := m["cidr_blocks"]
if !ok { if !ok {
raw = make([]string, 0, len(perm.IPRanges)) raw = make([]string, 0, len(perm.IpRanges))
} }
list := raw.([]string) list := raw.([]string)
for _, ip := range perm.IPRanges { for _, ip := range perm.IpRanges {
list = append(list, *ip.CIDRIP) list = append(list, *ip.CidrIp)
} }
m["cidr_blocks"] = list m["cidr_blocks"] = list
} }
var groups []string var groups []string
if len(perm.UserIDGroupPairs) > 0 { if len(perm.UserIdGroupPairs) > 0 {
groups = flattenSecurityGroups(perm.UserIDGroupPairs) groups = flattenSecurityGroups(perm.UserIdGroupPairs)
} }
for i, id := range groups { for i, id := range groups {
if id == d.Id() { if id == d.Id() {
@ -486,14 +486,14 @@ func resourceAwsSecurityGroupUpdateRules(
if ruleset == "egress" { if ruleset == "egress" {
req := &ec2.RevokeSecurityGroupEgressInput{ req := &ec2.RevokeSecurityGroupEgressInput{
GroupID: group.GroupID, GroupId: group.GroupId,
IPPermissions: remove, IpPermissions: remove,
} }
_, err = conn.RevokeSecurityGroupEgress(req) _, err = conn.RevokeSecurityGroupEgress(req)
} else { } else {
req := &ec2.RevokeSecurityGroupIngressInput{ req := &ec2.RevokeSecurityGroupIngressInput{
GroupID: group.GroupID, GroupId: group.GroupId,
IPPermissions: remove, IpPermissions: remove,
} }
_, err = conn.RevokeSecurityGroupIngress(req) _, err = conn.RevokeSecurityGroupIngress(req)
} }
@ -511,17 +511,17 @@ func resourceAwsSecurityGroupUpdateRules(
// Authorize the new rules // Authorize the new rules
if ruleset == "egress" { if ruleset == "egress" {
req := &ec2.AuthorizeSecurityGroupEgressInput{ req := &ec2.AuthorizeSecurityGroupEgressInput{
GroupID: group.GroupID, GroupId: group.GroupId,
IPPermissions: add, IpPermissions: add,
} }
_, err = conn.AuthorizeSecurityGroupEgress(req) _, err = conn.AuthorizeSecurityGroupEgress(req)
} else { } else {
req := &ec2.AuthorizeSecurityGroupIngressInput{ req := &ec2.AuthorizeSecurityGroupIngressInput{
GroupID: group.GroupID, GroupId: group.GroupId,
IPPermissions: add, IpPermissions: add,
} }
if group.VPCID == nil || *group.VPCID == "" { if group.VpcId == nil || *group.VpcId == "" {
req.GroupID = nil req.GroupId = nil
req.GroupName = group.GroupName req.GroupName = group.GroupName
} }
@ -544,7 +544,7 @@ func resourceAwsSecurityGroupUpdateRules(
func SGStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func SGStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(id)}, GroupIds: []*string{aws.String(id)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err != nil { if err != nil {

100
builtin/providers/aws/resource_aws_security_group_rule.go
View File

@ -100,12 +100,12 @@ func resourceAwsSecurityGroupRuleCreate(d *schema.ResourceData, meta interface{}
sg_id, "Ingress", perm) sg_id, "Ingress", perm)
req := &ec2.AuthorizeSecurityGroupIngressInput{ req := &ec2.AuthorizeSecurityGroupIngressInput{
GroupID: sg.GroupID, GroupId: sg.GroupId,
IPPermissions: []*ec2.IPPermission{perm}, IpPermissions: []*ec2.IpPermission{perm},
} }
if sg.VPCID == nil || *sg.VPCID == "" { if sg.VpcId == nil || *sg.VpcId == "" {
req.GroupID = nil req.GroupId = nil
req.GroupName = sg.GroupName req.GroupName = sg.GroupName
} }
@ -116,8 +116,8 @@ func resourceAwsSecurityGroupRuleCreate(d *schema.ResourceData, meta interface{}
sg_id, "Egress", perm) sg_id, "Egress", perm)
req := &ec2.AuthorizeSecurityGroupEgressInput{ req := &ec2.AuthorizeSecurityGroupEgressInput{
GroupID: sg.GroupID, GroupId: sg.GroupId,
IPPermissions: []*ec2.IPPermission{perm}, IpPermissions: []*ec2.IpPermission{perm},
} }
_, autherr = conn.AuthorizeSecurityGroupEgress(req) _, autherr = conn.AuthorizeSecurityGroupEgress(req)
@ -157,14 +157,14 @@ func resourceAwsSecurityGroupRuleRead(d *schema.ResourceData, meta interface{})
return nil return nil
} }
var rule *ec2.IPPermission var rule *ec2.IpPermission
ruleType := d.Get("type").(string) ruleType := d.Get("type").(string)
var rl []*ec2.IPPermission var rl []*ec2.IpPermission
switch ruleType { switch ruleType {
case "ingress": case "ingress":
rl = sg.IPPermissions rl = sg.IpPermissions
default: default:
rl = sg.IPPermissionsEgress rl = sg.IpPermissionsEgress
} }
for _, r := range rl { for _, r := range rl {
@ -182,19 +182,19 @@ func resourceAwsSecurityGroupRuleRead(d *schema.ResourceData, meta interface{})
d.Set("from_port", rule.FromPort) d.Set("from_port", rule.FromPort)
d.Set("to_port", rule.ToPort) d.Set("to_port", rule.ToPort)
d.Set("protocol", rule.IPProtocol) d.Set("protocol", rule.IpProtocol)
d.Set("type", ruleType) d.Set("type", ruleType)
var cb []string var cb []string
for _, c := range rule.IPRanges { for _, c := range rule.IpRanges {
cb = append(cb, *c.CIDRIP) cb = append(cb, *c.CidrIp)
} }
d.Set("cidr_blocks", cb) d.Set("cidr_blocks", cb)
if len(rule.UserIDGroupPairs) > 0 { if len(rule.UserIdGroupPairs) > 0 {
s := rule.UserIDGroupPairs[0] s := rule.UserIdGroupPairs[0]
d.Set("source_security_group_id", *s.GroupID) d.Set("source_security_group_id", *s.GroupId)
} }
return nil return nil
@ -216,8 +216,8 @@ func resourceAwsSecurityGroupRuleDelete(d *schema.ResourceData, meta interface{}
log.Printf("[DEBUG] Revoking rule (%s) from security group %s:\n%s", log.Printf("[DEBUG] Revoking rule (%s) from security group %s:\n%s",
"ingress", sg_id, perm) "ingress", sg_id, perm)
req := &ec2.RevokeSecurityGroupIngressInput{ req := &ec2.RevokeSecurityGroupIngressInput{
GroupID: sg.GroupID, GroupId: sg.GroupId,
IPPermissions: []*ec2.IPPermission{perm}, IpPermissions: []*ec2.IpPermission{perm},
} }
_, err = conn.RevokeSecurityGroupIngress(req) _, err = conn.RevokeSecurityGroupIngress(req)
@ -232,8 +232,8 @@ func resourceAwsSecurityGroupRuleDelete(d *schema.ResourceData, meta interface{}
log.Printf("[DEBUG] Revoking security group %#v %s rule: %#v", log.Printf("[DEBUG] Revoking security group %#v %s rule: %#v",
sg_id, "egress", perm) sg_id, "egress", perm)
req := &ec2.RevokeSecurityGroupEgressInput{ req := &ec2.RevokeSecurityGroupEgressInput{
GroupID: sg.GroupID, GroupId: sg.GroupId,
IPPermissions: []*ec2.IPPermission{perm}, IpPermissions: []*ec2.IpPermission{perm},
} }
_, err = conn.RevokeSecurityGroupEgress(req) _, err = conn.RevokeSecurityGroupEgress(req)
@ -252,7 +252,7 @@ func resourceAwsSecurityGroupRuleDelete(d *schema.ResourceData, meta interface{}
func findResourceSecurityGroup(conn *ec2.EC2, id string) (*ec2.SecurityGroup, error) { func findResourceSecurityGroup(conn *ec2.EC2, id string) (*ec2.SecurityGroup, error) {
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(id)}, GroupIds: []*string{aws.String(id)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err != nil { if err != nil {
@ -270,13 +270,13 @@ func findResourceSecurityGroup(conn *ec2.EC2, id string) (*ec2.SecurityGroup, er
// ByGroupPair implements sort.Interface for []*ec2.UserIDGroupPairs based on // ByGroupPair implements sort.Interface for []*ec2.UserIDGroupPairs based on
// GroupID or GroupName field (only one should be set). // GroupID or GroupName field (only one should be set).
type ByGroupPair []*ec2.UserIDGroupPair type ByGroupPair []*ec2.UserIdGroupPair
func (b ByGroupPair) Len() int { return len(b) } func (b ByGroupPair) Len() int { return len(b) }
func (b ByGroupPair) Swap(i, j int) { b[i], b[j] = b[j], b[i] } func (b ByGroupPair) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
func (b ByGroupPair) Less(i, j int) bool { func (b ByGroupPair) Less(i, j int) bool {
if b[i].GroupID != nil && b[j].GroupID != nil { if b[i].GroupId != nil && b[j].GroupId != nil {
return *b[i].GroupID < *b[j].GroupID return *b[i].GroupId < *b[j].GroupId
} }
if b[i].GroupName != nil && b[j].GroupName != nil { if b[i].GroupName != nil && b[j].GroupName != nil {
return *b[i].GroupName < *b[j].GroupName return *b[i].GroupName < *b[j].GroupName
@ -285,7 +285,7 @@ func (b ByGroupPair) Less(i, j int) bool {
panic("mismatched security group rules, may be a terraform bug") panic("mismatched security group rules, may be a terraform bug")
} }
func ipPermissionIDHash(ruleType string, ip *ec2.IPPermission) string { func ipPermissionIDHash(ruleType string, ip *ec2.IpPermission) string {
var buf bytes.Buffer var buf bytes.Buffer
if ip.FromPort != nil && *ip.FromPort > 0 { if ip.FromPort != nil && *ip.FromPort > 0 {
buf.WriteString(fmt.Sprintf("%d-", *ip.FromPort)) buf.WriteString(fmt.Sprintf("%d-", *ip.FromPort))
@ -293,15 +293,15 @@ func ipPermissionIDHash(ruleType string, ip *ec2.IPPermission) string {
if ip.ToPort != nil && *ip.ToPort > 0 { if ip.ToPort != nil && *ip.ToPort > 0 {
buf.WriteString(fmt.Sprintf("%d-", *ip.ToPort)) buf.WriteString(fmt.Sprintf("%d-", *ip.ToPort))
} }
buf.WriteString(fmt.Sprintf("%s-", *ip.IPProtocol)) buf.WriteString(fmt.Sprintf("%s-", *ip.IpProtocol))
buf.WriteString(fmt.Sprintf("%s-", ruleType)) buf.WriteString(fmt.Sprintf("%s-", ruleType))
// We need to make sure to sort the strings below so that we always // We need to make sure to sort the strings below so that we always
// generate the same hash code no matter what is in the set. // generate the same hash code no matter what is in the set.
if len(ip.IPRanges) > 0 { if len(ip.IpRanges) > 0 {
s := make([]string, len(ip.IPRanges)) s := make([]string, len(ip.IpRanges))
for i, r := range ip.IPRanges { for i, r := range ip.IpRanges {
s[i] = *r.CIDRIP s[i] = *r.CidrIp
} }
sort.Strings(s) sort.Strings(s)
@ -310,11 +310,11 @@ func ipPermissionIDHash(ruleType string, ip *ec2.IPPermission) string {
} }
} }
if len(ip.UserIDGroupPairs) > 0 { if len(ip.UserIdGroupPairs) > 0 {
sort.Sort(ByGroupPair(ip.UserIDGroupPairs)) sort.Sort(ByGroupPair(ip.UserIdGroupPairs))
for _, pair := range ip.UserIDGroupPairs { for _, pair := range ip.UserIdGroupPairs {
if pair.GroupID != nil { if pair.GroupId != nil {
buf.WriteString(fmt.Sprintf("%s-", *pair.GroupID)) buf.WriteString(fmt.Sprintf("%s-", *pair.GroupId))
} else { } else {
buf.WriteString("-") buf.WriteString("-")
} }
@ -329,12 +329,12 @@ func ipPermissionIDHash(ruleType string, ip *ec2.IPPermission) string {
return fmt.Sprintf("sg-%d", hashcode.String(buf.String())) return fmt.Sprintf("sg-%d", hashcode.String(buf.String()))
} }
func expandIPPerm(d *schema.ResourceData, sg *ec2.SecurityGroup) *ec2.IPPermission { func expandIPPerm(d *schema.ResourceData, sg *ec2.SecurityGroup) *ec2.IpPermission {
var perm ec2.IPPermission var perm ec2.IpPermission
perm.FromPort = aws.Int64(int64(d.Get("from_port").(int))) perm.FromPort = aws.Int64(int64(d.Get("from_port").(int)))
perm.ToPort = aws.Int64(int64(d.Get("to_port").(int))) perm.ToPort = aws.Int64(int64(d.Get("to_port").(int)))
perm.IPProtocol = aws.String(d.Get("protocol").(string)) perm.IpProtocol = aws.String(d.Get("protocol").(string))
// build a group map that behaves like a set // build a group map that behaves like a set
groups := make(map[string]bool) groups := make(map[string]bool)
@ -343,15 +343,15 @@ func expandIPPerm(d *schema.ResourceData, sg *ec2.SecurityGroup) *ec2.IPPermissi
} }
if v, ok := d.GetOk("self"); ok && v.(bool) { if v, ok := d.GetOk("self"); ok && v.(bool) {
if sg.VPCID != nil && *sg.VPCID != "" { if sg.VpcId != nil && *sg.VpcId != "" {
groups[*sg.GroupID] = true groups[*sg.GroupId] = true
} else { } else {
groups[*sg.GroupName] = true groups[*sg.GroupName] = true
} }
} }
if len(groups) > 0 { if len(groups) > 0 {
perm.UserIDGroupPairs = make([]*ec2.UserIDGroupPair, len(groups)) perm.UserIdGroupPairs = make([]*ec2.UserIdGroupPair, len(groups))
// build string list of group name/ids // build string list of group name/ids
var gl []string var gl []string
for k, _ := range groups { for k, _ := range groups {
@ -364,24 +364,24 @@ func expandIPPerm(d *schema.ResourceData, sg *ec2.SecurityGroup) *ec2.IPPermissi
ownerId, id = items[0], items[1] ownerId, id = items[0], items[1]
} }
perm.UserIDGroupPairs[i] = &ec2.UserIDGroupPair{ perm.UserIdGroupPairs[i] = &ec2.UserIdGroupPair{
GroupID: aws.String(id), GroupId: aws.String(id),
UserID: aws.String(ownerId), UserId: aws.String(ownerId),
} }
if sg.VPCID == nil || *sg.VPCID == "" { if sg.VpcId == nil || *sg.VpcId == "" {
perm.UserIDGroupPairs[i].GroupID = nil perm.UserIdGroupPairs[i].GroupId = nil
perm.UserIDGroupPairs[i].GroupName = aws.String(id) perm.UserIdGroupPairs[i].GroupName = aws.String(id)
perm.UserIDGroupPairs[i].UserID = nil perm.UserIdGroupPairs[i].UserId = nil
} }
} }
} }
if raw, ok := d.GetOk("cidr_blocks"); ok { if raw, ok := d.GetOk("cidr_blocks"); ok {
list := raw.([]interface{}) list := raw.([]interface{})
perm.IPRanges = make([]*ec2.IPRange, len(list)) perm.IpRanges = make([]*ec2.IpRange, len(list))
for i, v := range list { for i, v := range list {
perm.IPRanges[i] = &ec2.IPRange{CIDRIP: aws.String(v.(string))} perm.IpRanges[i] = &ec2.IpRange{CidrIp: aws.String(v.(string))}
} }
} }

16
builtin/providers/aws/resource_aws_security_group_rule_migrate.go
View File

@ -44,8 +44,8 @@ func migrateSGRuleStateV0toV1(is *terraform.InstanceState) (*terraform.InstanceS
return is, nil return is, nil
} }
func migrateExpandIPPerm(attrs map[string]string) (*ec2.IPPermission, error) { func migrateExpandIPPerm(attrs map[string]string) (*ec2.IpPermission, error) {
var perm ec2.IPPermission var perm ec2.IpPermission
tp, err := strconv.Atoi(attrs["to_port"]) tp, err := strconv.Atoi(attrs["to_port"])
if err != nil { if err != nil {
return nil, fmt.Errorf("Error converting to_port in Security Group migration") return nil, fmt.Errorf("Error converting to_port in Security Group migration")
@ -58,7 +58,7 @@ func migrateExpandIPPerm(attrs map[string]string) (*ec2.IPPermission, error) {
perm.ToPort = aws.Int64(int64(tp)) perm.ToPort = aws.Int64(int64(tp))
perm.FromPort = aws.Int64(int64(fp)) perm.FromPort = aws.Int64(int64(fp))
perm.IPProtocol = aws.String(attrs["protocol"]) perm.IpProtocol = aws.String(attrs["protocol"])
groups := make(map[string]bool) groups := make(map[string]bool)
if attrs["self"] == "true" { if attrs["self"] == "true" {
@ -70,7 +70,7 @@ func migrateExpandIPPerm(attrs map[string]string) (*ec2.IPPermission, error) {
} }
if len(groups) > 0 { if len(groups) > 0 {
perm.UserIDGroupPairs = make([]*ec2.UserIDGroupPair, len(groups)) perm.UserIdGroupPairs = make([]*ec2.UserIdGroupPair, len(groups))
// build string list of group name/ids // build string list of group name/ids
var gl []string var gl []string
for k, _ := range groups { for k, _ := range groups {
@ -78,8 +78,8 @@ func migrateExpandIPPerm(attrs map[string]string) (*ec2.IPPermission, error) {
} }
for i, name := range gl { for i, name := range gl {
perm.UserIDGroupPairs[i] = &ec2.UserIDGroupPair{ perm.UserIdGroupPairs[i] = &ec2.UserIdGroupPair{
GroupID: aws.String(name), GroupId: aws.String(name),
} }
} }
} }
@ -91,9 +91,9 @@ func migrateExpandIPPerm(attrs map[string]string) (*ec2.IPPermission, error) {
} }
} }
if len(cb) > 0 { if len(cb) > 0 {
perm.IPRanges = make([]*ec2.IPRange, len(cb)) perm.IpRanges = make([]*ec2.IpRange, len(cb))
for i, v := range cb { for i, v := range cb {
perm.IPRanges[i] = &ec2.IPRange{CIDRIP: aws.String(v)} perm.IpRanges[i] = &ec2.IpRange{CidrIp: aws.String(v)}
} }
} }

114
builtin/providers/aws/resource_aws_security_group_rule_test.go
View File

@ -13,72 +13,72 @@ import (
) )
func TestIpPermissionIDHash(t *testing.T) { func TestIpPermissionIDHash(t *testing.T) {
simple := &ec2.IPPermission{ simple := &ec2.IpPermission{
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
FromPort: aws.Int64(int64(80)), FromPort: aws.Int64(int64(80)),
ToPort: aws.Int64(int64(8000)), ToPort: aws.Int64(int64(8000)),
IPRanges: []*ec2.IPRange{ IpRanges: []*ec2.IpRange{
&ec2.IPRange{ &ec2.IpRange{
CIDRIP: aws.String("10.0.0.0/8"), CidrIp: aws.String("10.0.0.0/8"),
}, },
}, },
} }
egress := &ec2.IPPermission{ egress := &ec2.IpPermission{
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
FromPort: aws.Int64(int64(80)), FromPort: aws.Int64(int64(80)),
ToPort: aws.Int64(int64(8000)), ToPort: aws.Int64(int64(8000)),
IPRanges: []*ec2.IPRange{ IpRanges: []*ec2.IpRange{
&ec2.IPRange{ &ec2.IpRange{
CIDRIP: aws.String("10.0.0.0/8"), CidrIp: aws.String("10.0.0.0/8"),
}, },
}, },
} }
egress_all := &ec2.IPPermission{ egress_all := &ec2.IpPermission{
IPProtocol: aws.String("-1"), IpProtocol: aws.String("-1"),
IPRanges: []*ec2.IPRange{ IpRanges: []*ec2.IpRange{
&ec2.IPRange{ &ec2.IpRange{
CIDRIP: aws.String("10.0.0.0/8"), CidrIp: aws.String("10.0.0.0/8"),
}, },
}, },
} }
vpc_security_group_source := &ec2.IPPermission{ vpc_security_group_source := &ec2.IpPermission{
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
FromPort: aws.Int64(int64(80)), FromPort: aws.Int64(int64(80)),
ToPort: aws.Int64(int64(8000)), ToPort: aws.Int64(int64(8000)),
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("987654321"), UserId: aws.String("987654321"),
GroupID: aws.String("sg-12345678"), GroupId: aws.String("sg-12345678"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("123456789"), UserId: aws.String("123456789"),
GroupID: aws.String("sg-987654321"), GroupId: aws.String("sg-987654321"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("123456789"), UserId: aws.String("123456789"),
GroupID: aws.String("sg-12345678"), GroupId: aws.String("sg-12345678"),
}, },
}, },
} }
security_group_source := &ec2.IPPermission{ security_group_source := &ec2.IpPermission{
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
FromPort: aws.Int64(int64(80)), FromPort: aws.Int64(int64(80)),
ToPort: aws.Int64(int64(8000)), ToPort: aws.Int64(int64(8000)),
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("987654321"), UserId: aws.String("987654321"),
GroupName: aws.String("my-security-group"), GroupName: aws.String("my-security-group"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("123456789"), UserId: aws.String("123456789"),
GroupName: aws.String("my-security-group"), GroupName: aws.String("my-security-group"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("123456789"), UserId: aws.String("123456789"),
GroupName: aws.String("my-other-security-group"), GroupName: aws.String("my-other-security-group"),
}, },
}, },
@ -86,7 +86,7 @@ func TestIpPermissionIDHash(t *testing.T) {
// hardcoded hashes, to detect future change // hardcoded hashes, to detect future change
cases := []struct { cases := []struct {
Input *ec2.IPPermission Input *ec2.IpPermission
Type string Type string
Output string Output string
}{ }{
@ -109,12 +109,12 @@ func TestAccAWSSecurityGroupRule_Ingress_VPC(t *testing.T) {
var group ec2.SecurityGroup var group ec2.SecurityGroup
testRuleCount := func(*terraform.State) error { testRuleCount := func(*terraform.State) error {
if len(group.IPPermissions) != 1 { if len(group.IpPermissions) != 1 {
return fmt.Errorf("Wrong Security Group rule count, expected %d, got %d", return fmt.Errorf("Wrong Security Group rule count, expected %d, got %d",
1, len(group.IPPermissions)) 1, len(group.IpPermissions))
} }
rule := group.IPPermissions[0] rule := group.IpPermissions[0]
if *rule.FromPort != int64(80) { if *rule.FromPort != int64(80) {
return fmt.Errorf("Wrong Security Group port setting, expected %d, got %d", return fmt.Errorf("Wrong Security Group port setting, expected %d, got %d",
80, int(*rule.FromPort)) 80, int(*rule.FromPort))
@ -146,12 +146,12 @@ func TestAccAWSSecurityGroupRule_Ingress_Classic(t *testing.T) {
var group ec2.SecurityGroup var group ec2.SecurityGroup
testRuleCount := func(*terraform.State) error { testRuleCount := func(*terraform.State) error {
if len(group.IPPermissions) != 1 { if len(group.IpPermissions) != 1 {
return fmt.Errorf("Wrong Security Group rule count, expected %d, got %d", return fmt.Errorf("Wrong Security Group rule count, expected %d, got %d",
1, len(group.IPPermissions)) 1, len(group.IpPermissions))
} }
rule := group.IPPermissions[0] rule := group.IpPermissions[0]
if *rule.FromPort != int64(80) { if *rule.FromPort != int64(80) {
return fmt.Errorf("Wrong Security Group port setting, expected %d, got %d", return fmt.Errorf("Wrong Security Group port setting, expected %d, got %d",
80, int(*rule.FromPort)) 80, int(*rule.FromPort))
@ -183,13 +183,13 @@ func TestAccAWSSecurityGroupRule_MultiIngress(t *testing.T) {
var group ec2.SecurityGroup var group ec2.SecurityGroup
testMultiRuleCount := func(*terraform.State) error { testMultiRuleCount := func(*terraform.State) error {
if len(group.IPPermissions) != 2 { if len(group.IpPermissions) != 2 {
return fmt.Errorf("Wrong Security Group rule count, expected %d, got %d", return fmt.Errorf("Wrong Security Group rule count, expected %d, got %d",
2, len(group.IPPermissions)) 2, len(group.IpPermissions))
} }
var rule *ec2.IPPermission var rule *ec2.IpPermission
for _, r := range group.IPPermissions { for _, r := range group.IpPermissions {
if *r.FromPort == int64(80) { if *r.FromPort == int64(80) {
rule = r rule = r
} }
@ -266,11 +266,11 @@ func testAccCheckAWSSecurityGroupRuleDestroy(s *terraform.State) error {
// Retrieve our group // Retrieve our group
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(rs.Primary.ID)}, GroupIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err == nil { if err == nil {
if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupID == rs.Primary.ID { if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupId == rs.Primary.ID {
return fmt.Errorf("Security Group (%s) still exists.", rs.Primary.ID) return fmt.Errorf("Security Group (%s) still exists.", rs.Primary.ID)
} }
@ -303,14 +303,14 @@ func testAccCheckAWSSecurityGroupRuleExists(n string, group *ec2.SecurityGroup)
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(rs.Primary.ID)}, GroupIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err != nil { if err != nil {
return err return err
} }
if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupID == rs.Primary.ID { if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupId == rs.Primary.ID {
*group = *resp.SecurityGroups[0] *group = *resp.SecurityGroups[0]
return nil return nil
} }
@ -321,17 +321,17 @@ func testAccCheckAWSSecurityGroupRuleExists(n string, group *ec2.SecurityGroup)
func testAccCheckAWSSecurityGroupRuleAttributes(group *ec2.SecurityGroup, ruleType string) resource.TestCheckFunc { func testAccCheckAWSSecurityGroupRuleAttributes(group *ec2.SecurityGroup, ruleType string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
p := &ec2.IPPermission{ p := &ec2.IpPermission{
FromPort: aws.Int64(80), FromPort: aws.Int64(80),
ToPort: aws.Int64(8000), ToPort: aws.Int64(8000),
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("10.0.0.0/8")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("10.0.0.0/8")}},
} }
var rules []*ec2.IPPermission var rules []*ec2.IpPermission
if ruleType == "ingress" { if ruleType == "ingress" {
rules = group.IPPermissions rules = group.IpPermissions
} else { } else {
rules = group.IPPermissionsEgress rules = group.IpPermissionsEgress
} }
if len(rules) == 0 { if len(rules) == 0 {

82
builtin/providers/aws/resource_aws_security_group_test.go
View File

@ -56,7 +56,7 @@ func TestAccAWSSecurityGroup_self(t *testing.T) {
} }
}() }()
if *group.IPPermissions[0].UserIDGroupPairs[0].GroupID != *group.GroupID { if *group.IpPermissions[0].UserIdGroupPairs[0].GroupId != *group.GroupId {
return fmt.Errorf("bad: %#v", group) return fmt.Errorf("bad: %#v", group)
} }
@ -95,7 +95,7 @@ func TestAccAWSSecurityGroup_vpc(t *testing.T) {
var group ec2.SecurityGroup var group ec2.SecurityGroup
testCheck := func(*terraform.State) error { testCheck := func(*terraform.State) error {
if *group.VPCID == "" { if *group.VpcId == "" {
return fmt.Errorf("should have vpc ID") return fmt.Errorf("should have vpc ID")
} }
@ -147,7 +147,7 @@ func TestAccAWSSecurityGroup_vpcNegOneIngress(t *testing.T) {
var group ec2.SecurityGroup var group ec2.SecurityGroup
testCheck := func(*terraform.State) error { testCheck := func(*terraform.State) error {
if *group.VPCID == "" { if *group.VpcId == "" {
return fmt.Errorf("should have vpc ID") return fmt.Errorf("should have vpc ID")
} }
@ -300,11 +300,11 @@ func testAccCheckAWSSecurityGroupDestroy(s *terraform.State) error {
// Retrieve our group // Retrieve our group
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(rs.Primary.ID)}, GroupIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err == nil { if err == nil {
if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupID == rs.Primary.ID { if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupId == rs.Primary.ID {
return fmt.Errorf("Security Group (%s) still exists.", rs.Primary.ID) return fmt.Errorf("Security Group (%s) still exists.", rs.Primary.ID)
} }
@ -337,14 +337,14 @@ func testAccCheckAWSSecurityGroupExists(n string, group *ec2.SecurityGroup) reso
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(rs.Primary.ID)}, GroupIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err != nil { if err != nil {
return err return err
} }
if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupID == rs.Primary.ID { if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupId == rs.Primary.ID {
*group = *resp.SecurityGroups[0] *group = *resp.SecurityGroups[0]
return nil return nil
} }
@ -355,11 +355,11 @@ func testAccCheckAWSSecurityGroupExists(n string, group *ec2.SecurityGroup) reso
func testAccCheckAWSSecurityGroupAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc { func testAccCheckAWSSecurityGroupAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
p := &ec2.IPPermission{ p := &ec2.IpPermission{
FromPort: aws.Int64(80), FromPort: aws.Int64(80),
ToPort: aws.Int64(8000), ToPort: aws.Int64(8000),
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("10.0.0.0/8")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("10.0.0.0/8")}},
} }
if *group.GroupName != "terraform_acceptance_test_example" { if *group.GroupName != "terraform_acceptance_test_example" {
@ -370,15 +370,15 @@ func testAccCheckAWSSecurityGroupAttributes(group *ec2.SecurityGroup) resource.T
return fmt.Errorf("Bad description: %s", *group.Description) return fmt.Errorf("Bad description: %s", *group.Description)
} }
if len(group.IPPermissions) == 0 { if len(group.IpPermissions) == 0 {
return fmt.Errorf("No IPPerms") return fmt.Errorf("No IPPerms")
} }
// Compare our ingress // Compare our ingress
if !reflect.DeepEqual(group.IPPermissions[0], p) { if !reflect.DeepEqual(group.IpPermissions[0], p) {
return fmt.Errorf( return fmt.Errorf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
group.IPPermissions[0], group.IpPermissions[0],
p) p)
} }
@ -388,9 +388,9 @@ func testAccCheckAWSSecurityGroupAttributes(group *ec2.SecurityGroup) resource.T
func testAccCheckAWSSecurityGroupAttributesNegOneProtocol(group *ec2.SecurityGroup) resource.TestCheckFunc { func testAccCheckAWSSecurityGroupAttributesNegOneProtocol(group *ec2.SecurityGroup) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
p := &ec2.IPPermission{ p := &ec2.IpPermission{
IPProtocol: aws.String("-1"), IpProtocol: aws.String("-1"),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("10.0.0.0/8")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("10.0.0.0/8")}},
} }
if *group.GroupName != "terraform_acceptance_test_example" { if *group.GroupName != "terraform_acceptance_test_example" {
@ -401,15 +401,15 @@ func testAccCheckAWSSecurityGroupAttributesNegOneProtocol(group *ec2.SecurityGro
return fmt.Errorf("Bad description: %s", *group.Description) return fmt.Errorf("Bad description: %s", *group.Description)
} }
if len(group.IPPermissions) == 0 { if len(group.IpPermissions) == 0 {
return fmt.Errorf("No IPPerms") return fmt.Errorf("No IPPerms")
} }
// Compare our ingress // Compare our ingress
if !reflect.DeepEqual(group.IPPermissions[0], p) { if !reflect.DeepEqual(group.IpPermissions[0], p) {
return fmt.Errorf( return fmt.Errorf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
group.IPPermissions[0], group.IpPermissions[0],
p) p)
} }
@ -447,23 +447,23 @@ func TestAccAWSSecurityGroup_tags(t *testing.T) {
func testAccCheckAWSSecurityGroupAttributesChanged(group *ec2.SecurityGroup) resource.TestCheckFunc { func testAccCheckAWSSecurityGroupAttributesChanged(group *ec2.SecurityGroup) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
p := []*ec2.IPPermission{ p := []*ec2.IpPermission{
&ec2.IPPermission{ &ec2.IpPermission{
FromPort: aws.Int64(80), FromPort: aws.Int64(80),
ToPort: aws.Int64(9000), ToPort: aws.Int64(9000),
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("10.0.0.0/8")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("10.0.0.0/8")}},
}, },
&ec2.IPPermission{ &ec2.IpPermission{
FromPort: aws.Int64(80), FromPort: aws.Int64(80),
ToPort: aws.Int64(8000), ToPort: aws.Int64(8000),
IPProtocol: aws.String("tcp"), IpProtocol: aws.String("tcp"),
IPRanges: []*ec2.IPRange{ IpRanges: []*ec2.IpRange{
&ec2.IPRange{ &ec2.IpRange{
CIDRIP: aws.String("0.0.0.0/0"), CidrIp: aws.String("0.0.0.0/0"),
}, },
&ec2.IPRange{ &ec2.IpRange{
CIDRIP: aws.String("10.0.0.0/8"), CidrIp: aws.String("10.0.0.0/8"),
}, },
}, },
}, },
@ -478,22 +478,22 @@ func testAccCheckAWSSecurityGroupAttributesChanged(group *ec2.SecurityGroup) res
} }
// Compare our ingress // Compare our ingress
if len(group.IPPermissions) != 2 { if len(group.IpPermissions) != 2 {
return fmt.Errorf( return fmt.Errorf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
group.IPPermissions, group.IpPermissions,
p) p)
} }
if *group.IPPermissions[0].ToPort == 8000 { if *group.IpPermissions[0].ToPort == 8000 {
group.IPPermissions[1], group.IPPermissions[0] = group.IpPermissions[1], group.IpPermissions[0] =
group.IPPermissions[0], group.IPPermissions[1] group.IpPermissions[0], group.IpPermissions[1]
} }
if !reflect.DeepEqual(group.IPPermissions, p) { if !reflect.DeepEqual(group.IpPermissions, p) {
return fmt.Errorf( return fmt.Errorf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
group.IPPermissions, group.IpPermissions,
p) p)
} }
@ -514,18 +514,18 @@ func testAccCheckAWSSecurityGroupExistsWithoutDefault(n string) resource.TestChe
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
req := &ec2.DescribeSecurityGroupsInput{ req := &ec2.DescribeSecurityGroupsInput{
GroupIDs: []*string{aws.String(rs.Primary.ID)}, GroupIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err != nil { if err != nil {
return err return err
} }
if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupID == rs.Primary.ID { if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupId == rs.Primary.ID {
group := *resp.SecurityGroups[0] group := *resp.SecurityGroups[0]
if len(group.IPPermissionsEgress) != 1 { if len(group.IpPermissionsEgress) != 1 {
return fmt.Errorf("Security Group should have only 1 egress rule, got %d", len(group.IPPermissionsEgress)) return fmt.Errorf("Security Group should have only 1 egress rule, got %d", len(group.IpPermissionsEgress))
} }
} }

10
builtin/providers/aws/resource_aws_sns_topic.go
View File

@ -70,10 +70,10 @@ func resourceAwsSnsTopicCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating SNS topic: %s", err) return fmt.Errorf("Error creating SNS topic: %s", err)
} }
d.SetId(*output.TopicARN) d.SetId(*output.TopicArn)
// Write the ARN to the 'arn' field for export // Write the ARN to the 'arn' field for export
d.Set("arn", *output.TopicARN) d.Set("arn", *output.TopicArn)
return resourceAwsSnsTopicUpdate(d, meta) return resourceAwsSnsTopicUpdate(d, meta)
} }
@ -92,7 +92,7 @@ func resourceAwsSnsTopicUpdate(d *schema.ResourceData, meta interface{}) error {
if !(k == "policy" && n == "") { if !(k == "policy" && n == "") {
// Make API call to update attributes // Make API call to update attributes
req := &sns.SetTopicAttributesInput{ req := &sns.SetTopicAttributesInput{
TopicARN: aws.String(d.Id()), TopicArn: aws.String(d.Id()),
AttributeName: aws.String(attrKey), AttributeName: aws.String(attrKey),
AttributeValue: aws.String(n.(string)), AttributeValue: aws.String(n.(string)),
} }
@ -109,7 +109,7 @@ func resourceAwsSnsTopicRead(d *schema.ResourceData, meta interface{}) error {
snsconn := meta.(*AWSClient).snsconn snsconn := meta.(*AWSClient).snsconn
attributeOutput, err := snsconn.GetTopicAttributes(&sns.GetTopicAttributesInput{ attributeOutput, err := snsconn.GetTopicAttributes(&sns.GetTopicAttributesInput{
TopicARN: aws.String(d.Id()), TopicArn: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
@ -143,7 +143,7 @@ func resourceAwsSnsTopicDelete(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] SNS Delete Topic: %s", d.Id()) log.Printf("[DEBUG] SNS Delete Topic: %s", d.Id())
_, err := snsconn.DeleteTopic(&sns.DeleteTopicInput{ _, err := snsconn.DeleteTopic(&sns.DeleteTopicInput{
TopicARN: aws.String(d.Id()), TopicArn: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
return err return err

18
builtin/providers/aws/resource_aws_sns_topic_subscription.go
View File

@ -65,11 +65,11 @@ func resourceAwsSnsTopicSubscriptionCreate(d *schema.ResourceData, meta interfac
return err return err
} }
log.Printf("New subscription ARN: %s", *output.SubscriptionARN) log.Printf("New subscription ARN: %s", *output.SubscriptionArn)
d.SetId(*output.SubscriptionARN) d.SetId(*output.SubscriptionArn)
// Write the ARN to the 'arn' field for export // Write the ARN to the 'arn' field for export
d.Set("arn", *output.SubscriptionARN) d.Set("arn", *output.SubscriptionArn)
return resourceAwsSnsTopicSubscriptionUpdate(d, meta) return resourceAwsSnsTopicSubscriptionUpdate(d, meta)
} }
@ -82,7 +82,7 @@ func resourceAwsSnsTopicSubscriptionUpdate(d *schema.ResourceData, meta interfac
log.Printf("[DEBUG] Updating subscription %s", d.Id()) log.Printf("[DEBUG] Updating subscription %s", d.Id())
// Unsubscribe // Unsubscribe
_, err := snsconn.Unsubscribe(&sns.UnsubscribeInput{ _, err := snsconn.Unsubscribe(&sns.UnsubscribeInput{
SubscriptionARN: aws.String(d.Id()), SubscriptionArn: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
@ -91,7 +91,7 @@ func resourceAwsSnsTopicSubscriptionUpdate(d *schema.ResourceData, meta interfac
// Re-subscribe and set id // Re-subscribe and set id
output, err := subscribeToSNSTopic(d, snsconn) output, err := subscribeToSNSTopic(d, snsconn)
d.SetId(*output.SubscriptionARN) d.SetId(*output.SubscriptionArn)
} }
@ -105,7 +105,7 @@ func resourceAwsSnsTopicSubscriptionUpdate(d *schema.ResourceData, meta interfac
} }
req := &sns.SetSubscriptionAttributesInput{ req := &sns.SetSubscriptionAttributesInput{
SubscriptionARN: aws.String(d.Id()), SubscriptionArn: aws.String(d.Id()),
AttributeName: aws.String("RawMessageDelivery"), AttributeName: aws.String("RawMessageDelivery"),
AttributeValue: aws.String(attrValue), AttributeValue: aws.String(attrValue),
} }
@ -125,7 +125,7 @@ func resourceAwsSnsTopicSubscriptionRead(d *schema.ResourceData, meta interface{
log.Printf("[DEBUG] Loading subscription %s", d.Id()) log.Printf("[DEBUG] Loading subscription %s", d.Id())
attributeOutput, err := snsconn.GetSubscriptionAttributes(&sns.GetSubscriptionAttributesInput{ attributeOutput, err := snsconn.GetSubscriptionAttributes(&sns.GetSubscriptionAttributesInput{
SubscriptionARN: aws.String(d.Id()), SubscriptionArn: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
return err return err
@ -149,7 +149,7 @@ func resourceAwsSnsTopicSubscriptionDelete(d *schema.ResourceData, meta interfac
log.Printf("[DEBUG] SNS delete topic subscription: %s", d.Id()) log.Printf("[DEBUG] SNS delete topic subscription: %s", d.Id())
_, err := snsconn.Unsubscribe(&sns.UnsubscribeInput{ _, err := snsconn.Unsubscribe(&sns.UnsubscribeInput{
SubscriptionARN: aws.String(d.Id()), SubscriptionArn: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
return err return err
@ -167,7 +167,7 @@ func subscribeToSNSTopic(d *schema.ResourceData, snsconn *sns.SNS) (output *sns.
req := &sns.SubscribeInput{ req := &sns.SubscribeInput{
Protocol: aws.String(protocol), Protocol: aws.String(protocol),
Endpoint: aws.String(endpoint), Endpoint: aws.String(endpoint),
TopicARN: aws.String(topic_arn), TopicArn: aws.String(topic_arn),
} }
output, err = snsconn.Subscribe(req) output, err = snsconn.Subscribe(req)

4
builtin/providers/aws/resource_aws_sns_topic_subscription_test.go
View File

@ -38,7 +38,7 @@ func testAccCheckAWSSNSTopicSubscriptionDestroy(s *terraform.State) error {
// Try to find key pair // Try to find key pair
req := &sns.GetSubscriptionAttributesInput{ req := &sns.GetSubscriptionAttributesInput{
SubscriptionARN: aws.String(rs.Primary.ID), SubscriptionArn: aws.String(rs.Primary.ID),
} }
_, err := conn.GetSubscriptionAttributes(req) _, err := conn.GetSubscriptionAttributes(req)
@ -71,7 +71,7 @@ func testAccCheckAWSSNSTopicSubscriptionExists(n string) resource.TestCheckFunc
conn := testAccProvider.Meta().(*AWSClient).snsconn conn := testAccProvider.Meta().(*AWSClient).snsconn
params := &sns.GetSubscriptionAttributesInput{ params := &sns.GetSubscriptionAttributesInput{
SubscriptionARN: aws.String(rs.Primary.ID), SubscriptionArn: aws.String(rs.Primary.ID),
} }
_, err := conn.GetSubscriptionAttributes(params) _, err := conn.GetSubscriptionAttributes(params)

4
builtin/providers/aws/resource_aws_sns_topic_test.go
View File

@ -37,7 +37,7 @@ func testAccCheckAWSSNSTopicDestroy(s *terraform.State) error {
// Check if the topic exists by fetching its attributes // Check if the topic exists by fetching its attributes
params := &sns.GetTopicAttributesInput{ params := &sns.GetTopicAttributesInput{
TopicARN: aws.String(rs.Primary.ID), TopicArn: aws.String(rs.Primary.ID),
} }
_, err := conn.GetTopicAttributes(params) _, err := conn.GetTopicAttributes(params)
if err == nil { if err == nil {
@ -68,7 +68,7 @@ func testAccCheckAWSSNSTopicExists(n string) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).snsconn conn := testAccProvider.Meta().(*AWSClient).snsconn
params := &sns.GetTopicAttributesInput{ params := &sns.GetTopicAttributesInput{
TopicARN: aws.String(rs.Primary.ID), TopicArn: aws.String(rs.Primary.ID),
} }
_, err := conn.GetTopicAttributes(params) _, err := conn.GetTopicAttributes(params)

20
builtin/providers/aws/resource_aws_spot_instance_request.go
View File

@ -81,13 +81,13 @@ func resourceAwsSpotInstanceRequestCreate(d *schema.ResourceData, meta interface
LaunchSpecification: &ec2.RequestSpotLaunchSpecification{ LaunchSpecification: &ec2.RequestSpotLaunchSpecification{
BlockDeviceMappings: instanceOpts.BlockDeviceMappings, BlockDeviceMappings: instanceOpts.BlockDeviceMappings,
EBSOptimized: instanceOpts.EBSOptimized, EbsOptimized: instanceOpts.EBSOptimized,
Monitoring: instanceOpts.Monitoring, Monitoring: instanceOpts.Monitoring,
IAMInstanceProfile: instanceOpts.IAMInstanceProfile, IamInstanceProfile: instanceOpts.IAMInstanceProfile,
ImageID: instanceOpts.ImageID, ImageId: instanceOpts.ImageID,
InstanceType: instanceOpts.InstanceType, InstanceType: instanceOpts.InstanceType,
Placement: instanceOpts.SpotPlacement, Placement: instanceOpts.SpotPlacement,
SecurityGroupIDs: instanceOpts.SecurityGroupIDs, SecurityGroupIds: instanceOpts.SecurityGroupIDs,
SecurityGroups: instanceOpts.SecurityGroups, SecurityGroups: instanceOpts.SecurityGroups,
UserData: instanceOpts.UserData64, UserData: instanceOpts.UserData64,
}, },
@ -105,7 +105,7 @@ func resourceAwsSpotInstanceRequestCreate(d *schema.ResourceData, meta interface
} }
sir := *resp.SpotInstanceRequests[0] sir := *resp.SpotInstanceRequests[0]
d.SetId(*sir.SpotInstanceRequestID) d.SetId(*sir.SpotInstanceRequestId)
if d.Get("wait_for_fulfillment").(bool) { if d.Get("wait_for_fulfillment").(bool) {
spotStateConf := &resource.StateChangeConf{ spotStateConf := &resource.StateChangeConf{
@ -134,7 +134,7 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{}
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
req := &ec2.DescribeSpotInstanceRequestsInput{ req := &ec2.DescribeSpotInstanceRequestsInput{
SpotInstanceRequestIDs: []*string{aws.String(d.Id())}, SpotInstanceRequestIds: []*string{aws.String(d.Id())},
} }
resp, err := conn.DescribeSpotInstanceRequests(req) resp, err := conn.DescribeSpotInstanceRequests(req)
@ -166,8 +166,8 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{}
d.Set("spot_bid_status", *request.Status.Code) d.Set("spot_bid_status", *request.Status.Code)
// Instance ID is not set if the request is still pending // Instance ID is not set if the request is still pending
if request.InstanceID != nil { if request.InstanceId != nil {
d.Set("spot_instance_id", *request.InstanceID) d.Set("spot_instance_id", *request.InstanceId)
} }
d.Set("spot_request_state", *request.State) d.Set("spot_request_state", *request.State)
d.Set("tags", tagsToMap(request.Tags)) d.Set("tags", tagsToMap(request.Tags))
@ -195,7 +195,7 @@ func resourceAwsSpotInstanceRequestDelete(d *schema.ResourceData, meta interface
log.Printf("[INFO] Cancelling spot request: %s", d.Id()) log.Printf("[INFO] Cancelling spot request: %s", d.Id())
_, err := conn.CancelSpotInstanceRequests(&ec2.CancelSpotInstanceRequestsInput{ _, err := conn.CancelSpotInstanceRequests(&ec2.CancelSpotInstanceRequestsInput{
SpotInstanceRequestIDs: []*string{aws.String(d.Id())}, SpotInstanceRequestIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
@ -219,7 +219,7 @@ func SpotInstanceStateRefreshFunc(
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeSpotInstanceRequests(&ec2.DescribeSpotInstanceRequestsInput{ resp, err := conn.DescribeSpotInstanceRequests(&ec2.DescribeSpotInstanceRequestsInput{
SpotInstanceRequestIDs: []*string{sir.SpotInstanceRequestID}, SpotInstanceRequestIds: []*string{sir.SpotInstanceRequestId},
}) })
if err != nil { if err != nil {

6
builtin/providers/aws/resource_aws_spot_instance_request_test.go
View File

@ -44,7 +44,7 @@ func testAccCheckAWSSpotInstanceRequestDestroy(s *terraform.State) error {
} }
req := &ec2.DescribeSpotInstanceRequestsInput{ req := &ec2.DescribeSpotInstanceRequestsInput{
SpotInstanceRequestIDs: []*string{aws.String(rs.Primary.ID)}, SpotInstanceRequestIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeSpotInstanceRequests(req) resp, err := conn.DescribeSpotInstanceRequests(req)
@ -66,7 +66,7 @@ func testAccCheckAWSSpotInstanceRequestDestroy(s *terraform.State) error {
// Now check if the associated Spot Instance was also destroyed // Now check if the associated Spot Instance was also destroyed
instId := rs.Primary.Attributes["spot_instance_id"] instId := rs.Primary.Attributes["spot_instance_id"]
instResp, instErr := conn.DescribeInstances(&ec2.DescribeInstancesInput{ instResp, instErr := conn.DescribeInstances(&ec2.DescribeInstancesInput{
InstanceIDs: []*string{aws.String(instId)}, InstanceIds: []*string{aws.String(instId)},
}) })
if instErr == nil { if instErr == nil {
if len(instResp.Reservations) > 0 { if len(instResp.Reservations) > 0 {
@ -104,7 +104,7 @@ func testAccCheckAWSSpotInstanceRequestExists(
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
params := &ec2.DescribeSpotInstanceRequestsInput{ params := &ec2.DescribeSpotInstanceRequestsInput{
SpotInstanceRequestIDs: []*string{&rs.Primary.ID}, SpotInstanceRequestIds: []*string{&rs.Primary.ID},
} }
resp, err := conn.DescribeSpotInstanceRequests(params) resp, err := conn.DescribeSpotInstanceRequests(params)

8
builtin/providers/aws/resource_aws_sqs_queue.go
View File

@ -116,7 +116,7 @@ func resourceAwsSqsQueueCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating SQS queue: %s", err) return fmt.Errorf("Error creating SQS queue: %s", err)
} }
d.SetId(*output.QueueURL) d.SetId(*output.QueueUrl)
return resourceAwsSqsQueueUpdate(d, meta) return resourceAwsSqsQueueUpdate(d, meta)
} }
@ -143,7 +143,7 @@ func resourceAwsSqsQueueUpdate(d *schema.ResourceData, meta interface{}) error {
if len(attributes) > 0 { if len(attributes) > 0 {
req := &sqs.SetQueueAttributesInput{ req := &sqs.SetQueueAttributesInput{
QueueURL: aws.String(d.Id()), QueueUrl: aws.String(d.Id()),
Attributes: attributes, Attributes: attributes,
} }
sqsconn.SetQueueAttributes(req) sqsconn.SetQueueAttributes(req)
@ -156,7 +156,7 @@ func resourceAwsSqsQueueRead(d *schema.ResourceData, meta interface{}) error {
sqsconn := meta.(*AWSClient).sqsconn sqsconn := meta.(*AWSClient).sqsconn
attributeOutput, err := sqsconn.GetQueueAttributes(&sqs.GetQueueAttributesInput{ attributeOutput, err := sqsconn.GetQueueAttributes(&sqs.GetQueueAttributesInput{
QueueURL: aws.String(d.Id()), QueueUrl: aws.String(d.Id()),
AttributeNames: []*string{aws.String("All")}, AttributeNames: []*string{aws.String("All")},
}) })
@ -191,7 +191,7 @@ func resourceAwsSqsQueueDelete(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] SQS Delete Queue: %s", d.Id()) log.Printf("[DEBUG] SQS Delete Queue: %s", d.Id())
_, err := sqsconn.DeleteQueue(&sqs.DeleteQueueInput{ _, err := sqsconn.DeleteQueue(&sqs.DeleteQueueInput{
QueueURL: aws.String(d.Id()), QueueUrl: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
return err return err

6
builtin/providers/aws/resource_aws_sqs_queue_test.go
View File

@ -43,7 +43,7 @@ func testAccCheckAWSSQSQueueDestroy(s *terraform.State) error {
// Check if queue exists by checking for its attributes // Check if queue exists by checking for its attributes
params := &sqs.GetQueueAttributesInput{ params := &sqs.GetQueueAttributesInput{
QueueURL: aws.String(rs.Primary.ID), QueueUrl: aws.String(rs.Primary.ID),
} }
_, err := conn.GetQueueAttributes(params) _, err := conn.GetQueueAttributes(params)
if err == nil { if err == nil {
@ -74,7 +74,7 @@ func testAccCheckAWSSQSExistsWithDefaults(n string) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).sqsconn conn := testAccProvider.Meta().(*AWSClient).sqsconn
params := &sqs.GetQueueAttributesInput{ params := &sqs.GetQueueAttributesInput{
QueueURL: aws.String(rs.Primary.ID), QueueUrl: aws.String(rs.Primary.ID),
AttributeNames: []*string{aws.String("All")}, AttributeNames: []*string{aws.String("All")},
} }
resp, err := conn.GetQueueAttributes(params) resp, err := conn.GetQueueAttributes(params)
@ -124,7 +124,7 @@ func testAccCheckAWSSQSExistsWithOverrides(n string) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).sqsconn conn := testAccProvider.Meta().(*AWSClient).sqsconn
params := &sqs.GetQueueAttributesInput{ params := &sqs.GetQueueAttributesInput{
QueueURL: aws.String(rs.Primary.ID), QueueUrl: aws.String(rs.Primary.ID),
AttributeNames: []*string{aws.String("All")}, AttributeNames: []*string{aws.String("All")},
} }
resp, err := conn.GetQueueAttributes(params) resp, err := conn.GetQueueAttributes(params)

28
builtin/providers/aws/resource_aws_subnet.go
View File

@ -56,8 +56,8 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error {
createOpts := &ec2.CreateSubnetInput{ createOpts := &ec2.CreateSubnetInput{
AvailabilityZone: aws.String(d.Get("availability_zone").(string)), AvailabilityZone: aws.String(d.Get("availability_zone").(string)),
CIDRBlock: aws.String(d.Get("cidr_block").(string)), CidrBlock: aws.String(d.Get("cidr_block").(string)),
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
} }
var err error var err error
@ -69,15 +69,15 @@ func resourceAwsSubnetCreate(d *schema.ResourceData, meta interface{}) error {
// Get the ID and store it // Get the ID and store it
subnet := resp.Subnet subnet := resp.Subnet
d.SetId(*subnet.SubnetID) d.SetId(*subnet.SubnetId)
log.Printf("[INFO] Subnet ID: %s", *subnet.SubnetID) log.Printf("[INFO] Subnet ID: %s", *subnet.SubnetId)
// Wait for the Subnet to become available // Wait for the Subnet to become available
log.Printf("[DEBUG] Waiting for subnet (%s) to become available", *subnet.SubnetID) log.Printf("[DEBUG] Waiting for subnet (%s) to become available", *subnet.SubnetId)
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"pending"}, Pending: []string{"pending"},
Target: "available", Target: "available",
Refresh: SubnetStateRefreshFunc(conn, *subnet.SubnetID), Refresh: SubnetStateRefreshFunc(conn, *subnet.SubnetId),
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
} }
@ -96,7 +96,7 @@ func resourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{ resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{
SubnetIDs: []*string{aws.String(d.Id())}, SubnetIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
@ -113,10 +113,10 @@ func resourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error {
subnet := resp.Subnets[0] subnet := resp.Subnets[0]
d.Set("vpc_id", subnet.VPCID) d.Set("vpc_id", subnet.VpcId)
d.Set("availability_zone", subnet.AvailabilityZone) d.Set("availability_zone", subnet.AvailabilityZone)
d.Set("cidr_block", subnet.CIDRBlock) d.Set("cidr_block", subnet.CidrBlock)
d.Set("map_public_ip_on_launch", subnet.MapPublicIPOnLaunch) d.Set("map_public_ip_on_launch", subnet.MapPublicIpOnLaunch)
d.Set("tags", tagsToMap(subnet.Tags)) d.Set("tags", tagsToMap(subnet.Tags))
return nil return nil
@ -135,8 +135,8 @@ func resourceAwsSubnetUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("map_public_ip_on_launch") { if d.HasChange("map_public_ip_on_launch") {
modifyOpts := &ec2.ModifySubnetAttributeInput{ modifyOpts := &ec2.ModifySubnetAttributeInput{
SubnetID: aws.String(d.Id()), SubnetId: aws.String(d.Id()),
MapPublicIPOnLaunch: &ec2.AttributeBooleanValue{ MapPublicIpOnLaunch: &ec2.AttributeBooleanValue{
Value: aws.Bool(d.Get("map_public_ip_on_launch").(bool)), Value: aws.Bool(d.Get("map_public_ip_on_launch").(bool)),
}, },
} }
@ -162,7 +162,7 @@ func resourceAwsSubnetDelete(d *schema.ResourceData, meta interface{}) error {
log.Printf("[INFO] Deleting subnet: %s", d.Id()) log.Printf("[INFO] Deleting subnet: %s", d.Id())
req := &ec2.DeleteSubnetInput{ req := &ec2.DeleteSubnetInput{
SubnetID: aws.String(d.Id()), SubnetId: aws.String(d.Id()),
} }
wait := resource.StateChangeConf{ wait := resource.StateChangeConf{
@ -203,7 +203,7 @@ func resourceAwsSubnetDelete(d *schema.ResourceData, meta interface{}) error {
func SubnetStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func SubnetStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{ resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{
SubnetIDs: []*string{aws.String(id)}, SubnetIds: []*string{aws.String(id)},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidSubnetID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidSubnetID.NotFound" {

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

@ -15,12 +15,12 @@ func TestAccAWSSubnet_basic(t *testing.T) {
var v ec2.Subnet var v ec2.Subnet
testCheck := func(*terraform.State) error { testCheck := func(*terraform.State) error {
if *v.CIDRBlock != "10.1.1.0/24" { if *v.CidrBlock != "10.1.1.0/24" {
return fmt.Errorf("bad cidr: %s", *v.CIDRBlock) return fmt.Errorf("bad cidr: %s", *v.CidrBlock)
} }
if *v.MapPublicIPOnLaunch != true { if *v.MapPublicIpOnLaunch != true {
return fmt.Errorf("bad MapPublicIpOnLaunch: %t", *v.MapPublicIPOnLaunch) return fmt.Errorf("bad MapPublicIpOnLaunch: %t", *v.MapPublicIpOnLaunch)
} }
return nil return nil
@ -53,7 +53,7 @@ func testAccCheckSubnetDestroy(s *terraform.State) error {
// Try to find the resource // Try to find the resource
resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{ resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{
SubnetIDs: []*string{aws.String(rs.Primary.ID)}, SubnetIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.Subnets) > 0 { if len(resp.Subnets) > 0 {
@ -89,7 +89,7 @@ func testAccCheckSubnetExists(n string, v *ec2.Subnet) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{ resp, err := conn.DescribeSubnets(&ec2.DescribeSubnetsInput{
SubnetIDs: []*string{aws.String(rs.Primary.ID)}, SubnetIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err != nil { if err != nil {
return err return err

14
builtin/providers/aws/resource_aws_volume_attachment.go
View File

@ -56,8 +56,8 @@ func resourceAwsVolumeAttachmentCreate(d *schema.ResourceData, meta interface{})
opts := &ec2.AttachVolumeInput{ opts := &ec2.AttachVolumeInput{
Device: aws.String(name), Device: aws.String(name),
InstanceID: aws.String(iID), InstanceId: aws.String(iID),
VolumeID: aws.String(vID), VolumeId: aws.String(vID),
} }
log.Printf("[DEBUG] Attaching Volume (%s) to Instance (%s)", vID, iID) log.Printf("[DEBUG] Attaching Volume (%s) to Instance (%s)", vID, iID)
@ -94,7 +94,7 @@ func volumeAttachmentStateRefreshFunc(conn *ec2.EC2, volumeID, instanceID string
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
request := &ec2.DescribeVolumesInput{ request := &ec2.DescribeVolumesInput{
VolumeIDs: []*string{aws.String(volumeID)}, VolumeIds: []*string{aws.String(volumeID)},
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("attachment.instance-id"), Name: aws.String("attachment.instance-id"),
@ -114,7 +114,7 @@ func volumeAttachmentStateRefreshFunc(conn *ec2.EC2, volumeID, instanceID string
if len(resp.Volumes) > 0 { if len(resp.Volumes) > 0 {
v := resp.Volumes[0] v := resp.Volumes[0]
for _, a := range v.Attachments { for _, a := range v.Attachments {
if a.InstanceID != nil && *a.InstanceID == instanceID { if a.InstanceId != nil && *a.InstanceId == instanceID {
return a, *a.State, nil return a, *a.State, nil
} }
} }
@ -127,7 +127,7 @@ func resourceAwsVolumeAttachmentRead(d *schema.ResourceData, meta interface{}) e
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
request := &ec2.DescribeVolumesInput{ request := &ec2.DescribeVolumesInput{
VolumeIDs: []*string{aws.String(d.Get("volume_id").(string))}, VolumeIds: []*string{aws.String(d.Get("volume_id").(string))},
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("attachment.instance-id"), Name: aws.String("attachment.instance-id"),
@ -155,8 +155,8 @@ func resourceAwsVolumeAttachmentDelete(d *schema.ResourceData, meta interface{})
opts := &ec2.DetachVolumeInput{ opts := &ec2.DetachVolumeInput{
Device: aws.String(d.Get("device_name").(string)), Device: aws.String(d.Get("device_name").(string)),
InstanceID: aws.String(iID), InstanceId: aws.String(iID),
VolumeID: aws.String(vID), VolumeId: aws.String(vID),
Force: aws.Bool(d.Get("force_detach").(bool)), Force: aws.Bool(d.Get("force_detach").(bool)),
} }

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

@ -49,7 +49,7 @@ func testAccCheckVolumeAttachmentExists(n string, i *ec2.Instance, v *ec2.Volume
for _, b := range i.BlockDeviceMappings { for _, b := range i.BlockDeviceMappings {
if rs.Primary.Attributes["device_name"] == *b.DeviceName { if rs.Primary.Attributes["device_name"] == *b.DeviceName {
if b.EBS.VolumeID != nil && rs.Primary.Attributes["volume_id"] == *b.EBS.VolumeID { if b.Ebs.VolumeId != nil && rs.Primary.Attributes["volume_id"] == *b.Ebs.VolumeId {
// pass // pass
return nil return nil
} }

74
builtin/providers/aws/resource_aws_vpc.go
View File

@ -87,19 +87,19 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error {
instance_tenancy = v.(string) instance_tenancy = v.(string)
} }
// Create the VPC // Create the VPC
createOpts := &ec2.CreateVPCInput{ createOpts := &ec2.CreateVpcInput{
CIDRBlock: aws.String(d.Get("cidr_block").(string)), CidrBlock: aws.String(d.Get("cidr_block").(string)),
InstanceTenancy: aws.String(instance_tenancy), InstanceTenancy: aws.String(instance_tenancy),
} }
log.Printf("[DEBUG] VPC create config: %#v", *createOpts) log.Printf("[DEBUG] VPC create config: %#v", *createOpts)
vpcResp, err := conn.CreateVPC(createOpts) vpcResp, err := conn.CreateVpc(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating VPC: %s", err) return fmt.Errorf("Error creating VPC: %s", err)
} }
// Get the ID and store it // Get the ID and store it
vpc := vpcResp.VPC vpc := vpcResp.Vpc
d.SetId(*vpc.VPCID) d.SetId(*vpc.VpcId)
log.Printf("[INFO] VPC ID: %s", d.Id()) log.Printf("[INFO] VPC ID: %s", d.Id())
// Set partial mode and say that we setup the cidr block // Set partial mode and say that we setup the cidr block
@ -140,35 +140,35 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
} }
// VPC stuff // VPC stuff
vpc := vpcRaw.(*ec2.VPC) vpc := vpcRaw.(*ec2.Vpc)
vpcid := d.Id() vpcid := d.Id()
d.Set("cidr_block", vpc.CIDRBlock) d.Set("cidr_block", vpc.CidrBlock)
d.Set("dhcp_options_id", vpc.DHCPOptionsID) d.Set("dhcp_options_id", vpc.DhcpOptionsId)
// Tags // Tags
d.Set("tags", tagsToMap(vpc.Tags)) d.Set("tags", tagsToMap(vpc.Tags))
// Attributes // Attributes
attribute := "enableDnsSupport" attribute := "enableDnsSupport"
DescribeAttrOpts := &ec2.DescribeVPCAttributeInput{ DescribeAttrOpts := &ec2.DescribeVpcAttributeInput{
Attribute: aws.String(attribute), Attribute: aws.String(attribute),
VPCID: aws.String(vpcid), VpcId: aws.String(vpcid),
} }
resp, err := conn.DescribeVPCAttribute(DescribeAttrOpts) resp, err := conn.DescribeVpcAttribute(DescribeAttrOpts)
if err != nil { if err != nil {
return err return err
} }
d.Set("enable_dns_support", *resp.EnableDNSSupport) d.Set("enable_dns_support", *resp.EnableDnsSupport)
attribute = "enableDnsHostnames" attribute = "enableDnsHostnames"
DescribeAttrOpts = &ec2.DescribeVPCAttributeInput{ DescribeAttrOpts = &ec2.DescribeVpcAttributeInput{
Attribute: &attribute, Attribute: &attribute,
VPCID: &vpcid, VpcId: &vpcid,
} }
resp, err = conn.DescribeVPCAttribute(DescribeAttrOpts) resp, err = conn.DescribeVpcAttribute(DescribeAttrOpts)
if err != nil { if err != nil {
return err return err
} }
d.Set("enable_dns_hostnames", *resp.EnableDNSHostnames) d.Set("enable_dns_hostnames", *resp.EnableDnsHostnames)
// Get the main routing table for this VPC // Get the main routing table for this VPC
// Really Ugly need to make this better - rmenn // Really Ugly need to make this better - rmenn
@ -188,7 +188,7 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
return err return err
} }
if v := routeResp.RouteTables; len(v) > 0 { if v := routeResp.RouteTables; len(v) > 0 {
d.Set("main_route_table_id", *v[0].RouteTableID) d.Set("main_route_table_id", *v[0].RouteTableId)
} }
resourceAwsVpcSetDefaultNetworkAcl(conn, d) resourceAwsVpcSetDefaultNetworkAcl(conn, d)
@ -205,9 +205,9 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
vpcid := d.Id() vpcid := d.Id()
if d.HasChange("enable_dns_hostnames") { if d.HasChange("enable_dns_hostnames") {
val := d.Get("enable_dns_hostnames").(bool) val := d.Get("enable_dns_hostnames").(bool)
modifyOpts := &ec2.ModifyVPCAttributeInput{ modifyOpts := &ec2.ModifyVpcAttributeInput{
VPCID: &vpcid, VpcId: &vpcid,
EnableDNSHostnames: &ec2.AttributeBooleanValue{ EnableDnsHostnames: &ec2.AttributeBooleanValue{
Value: &val, Value: &val,
}, },
} }
@ -215,7 +215,7 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
log.Printf( log.Printf(
"[INFO] Modifying enable_dns_support vpc attribute for %s: %#v", "[INFO] Modifying enable_dns_support vpc attribute for %s: %#v",
d.Id(), modifyOpts) d.Id(), modifyOpts)
if _, err := conn.ModifyVPCAttribute(modifyOpts); err != nil { if _, err := conn.ModifyVpcAttribute(modifyOpts); err != nil {
return err return err
} }
@ -224,9 +224,9 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("enable_dns_support") { if d.HasChange("enable_dns_support") {
val := d.Get("enable_dns_support").(bool) val := d.Get("enable_dns_support").(bool)
modifyOpts := &ec2.ModifyVPCAttributeInput{ modifyOpts := &ec2.ModifyVpcAttributeInput{
VPCID: &vpcid, VpcId: &vpcid,
EnableDNSSupport: &ec2.AttributeBooleanValue{ EnableDnsSupport: &ec2.AttributeBooleanValue{
Value: &val, Value: &val,
}, },
} }
@ -234,7 +234,7 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
log.Printf( log.Printf(
"[INFO] Modifying enable_dns_support vpc attribute for %s: %#v", "[INFO] Modifying enable_dns_support vpc attribute for %s: %#v",
d.Id(), modifyOpts) d.Id(), modifyOpts)
if _, err := conn.ModifyVPCAttribute(modifyOpts); err != nil { if _, err := conn.ModifyVpcAttribute(modifyOpts); err != nil {
return err return err
} }
@ -254,13 +254,13 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
func resourceAwsVpcDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
vpcID := d.Id() vpcID := d.Id()
DeleteVpcOpts := &ec2.DeleteVPCInput{ DeleteVpcOpts := &ec2.DeleteVpcInput{
VPCID: &vpcID, VpcId: &vpcID,
} }
log.Printf("[INFO] Deleting VPC: %s", d.Id()) log.Printf("[INFO] Deleting VPC: %s", d.Id())
return resource.Retry(5*time.Minute, func() error { return resource.Retry(5*time.Minute, func() error {
_, err := conn.DeleteVPC(DeleteVpcOpts) _, err := conn.DeleteVpc(DeleteVpcOpts)
if err == nil { if err == nil {
return nil return nil
} }
@ -287,10 +287,10 @@ func resourceAwsVpcDelete(d *schema.ResourceData, meta interface{}) error {
// a VPC. // a VPC.
func VPCStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func VPCStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
DescribeVpcOpts := &ec2.DescribeVPCsInput{ DescribeVpcOpts := &ec2.DescribeVpcsInput{
VPCIDs: []*string{aws.String(id)}, VpcIds: []*string{aws.String(id)},
} }
resp, err := conn.DescribeVPCs(DescribeVpcOpts) resp, err := conn.DescribeVpcs(DescribeVpcOpts)
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcID.NotFound" {
resp = nil resp = nil
@ -306,7 +306,7 @@ func VPCStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return nil, "", nil return nil, "", nil
} }
vpc := resp.VPCs[0] vpc := resp.Vpcs[0]
return vpc, *vpc.State, nil return vpc, *vpc.State, nil
} }
} }
@ -320,16 +320,16 @@ func resourceAwsVpcSetDefaultNetworkAcl(conn *ec2.EC2, d *schema.ResourceData) e
Name: aws.String("vpc-id"), Name: aws.String("vpc-id"),
Values: []*string{aws.String(d.Id())}, Values: []*string{aws.String(d.Id())},
} }
DescribeNetworkACLOpts := &ec2.DescribeNetworkACLsInput{ DescribeNetworkACLOpts := &ec2.DescribeNetworkAclsInput{
Filters: []*ec2.Filter{filter1, filter2}, Filters: []*ec2.Filter{filter1, filter2},
} }
networkAclResp, err := conn.DescribeNetworkACLs(DescribeNetworkACLOpts) networkAclResp, err := conn.DescribeNetworkAcls(DescribeNetworkACLOpts)
if err != nil { if err != nil {
return err return err
} }
if v := networkAclResp.NetworkACLs; len(v) > 0 { if v := networkAclResp.NetworkAcls; len(v) > 0 {
d.Set("default_network_acl_id", v[0].NetworkACLID) d.Set("default_network_acl_id", v[0].NetworkAclId)
} }
return nil return nil
@ -353,7 +353,7 @@ func resourceAwsVpcSetDefaultSecurityGroup(conn *ec2.EC2, d *schema.ResourceData
return err return err
} }
if v := securityGroupResp.SecurityGroups; len(v) > 0 { if v := securityGroupResp.SecurityGroups; len(v) > 0 {
d.Set("default_security_group_id", v[0].GroupID) d.Set("default_security_group_id", v[0].GroupId)
} }
return nil return nil

56
builtin/providers/aws/resource_aws_vpc_dhcp_options.go
View File

@ -65,7 +65,7 @@ func resourceAwsVpcDhcpOptions() *schema.Resource {
func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
setDHCPOption := func(key string) *ec2.NewDHCPConfiguration { setDHCPOption := func(key string) *ec2.NewDhcpConfiguration {
log.Printf("[DEBUG] Setting DHCP option %s...", key) log.Printf("[DEBUG] Setting DHCP option %s...", key)
tfKey := strings.Replace(key, "-", "_", -1) tfKey := strings.Replace(key, "-", "_", -1)
@ -75,7 +75,7 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e
} }
if v, ok := value.(string); ok { if v, ok := value.(string); ok {
return &ec2.NewDHCPConfiguration{ return &ec2.NewDhcpConfiguration{
Key: aws.String(key), Key: aws.String(key),
Values: []*string{ Values: []*string{
aws.String(v), aws.String(v),
@ -89,7 +89,7 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e
s = append(s, aws.String(attr.(string))) s = append(s, aws.String(attr.(string)))
} }
return &ec2.NewDHCPConfiguration{ return &ec2.NewDhcpConfiguration{
Key: aws.String(key), Key: aws.String(key),
Values: s, Values: s,
} }
@ -98,8 +98,8 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e
return nil return nil
} }
createOpts := &ec2.CreateDHCPOptionsInput{ createOpts := &ec2.CreateDhcpOptionsInput{
DHCPConfigurations: []*ec2.NewDHCPConfiguration{ DhcpConfigurations: []*ec2.NewDhcpConfiguration{
setDHCPOption("domain-name"), setDHCPOption("domain-name"),
setDHCPOption("domain-name-servers"), setDHCPOption("domain-name-servers"),
setDHCPOption("ntp-servers"), setDHCPOption("ntp-servers"),
@ -108,13 +108,13 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e
}, },
} }
resp, err := conn.CreateDHCPOptions(createOpts) resp, err := conn.CreateDhcpOptions(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating DHCP Options Set: %s", err) return fmt.Errorf("Error creating DHCP Options Set: %s", err)
} }
dos := resp.DHCPOptions dos := resp.DhcpOptions
d.SetId(*dos.DHCPOptionsID) d.SetId(*dos.DhcpOptionsId)
log.Printf("[INFO] DHCP Options Set ID: %s", d.Id()) log.Printf("[INFO] DHCP Options Set ID: %s", d.Id())
// Wait for the DHCP Options to become available // Wait for the DHCP Options to become available
@ -136,25 +136,25 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e
func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
req := &ec2.DescribeDHCPOptionsInput{ req := &ec2.DescribeDhcpOptionsInput{
DHCPOptionsIDs: []*string{ DhcpOptionsIds: []*string{
aws.String(d.Id()), aws.String(d.Id()),
}, },
} }
resp, err := conn.DescribeDHCPOptions(req) resp, err := conn.DescribeDhcpOptions(req)
if err != nil { if err != nil {
return fmt.Errorf("Error retrieving DHCP Options: %s", err) return fmt.Errorf("Error retrieving DHCP Options: %s", err)
} }
if len(resp.DHCPOptions) == 0 { if len(resp.DhcpOptions) == 0 {
return nil return nil
} }
opts := resp.DHCPOptions[0] opts := resp.DhcpOptions[0]
d.Set("tags", tagsToMap(opts.Tags)) d.Set("tags", tagsToMap(opts.Tags))
for _, cfg := range opts.DHCPConfigurations { for _, cfg := range opts.DhcpConfigurations {
tfKey := strings.Replace(*cfg.Key, "-", "_", -1) tfKey := strings.Replace(*cfg.Key, "-", "_", -1)
if _, ok := d.Get(tfKey).(string); ok { if _, ok := d.Get(tfKey).(string); ok {
@ -182,8 +182,8 @@ func resourceAwsVpcDhcpOptionsDelete(d *schema.ResourceData, meta interface{}) e
return resource.Retry(3*time.Minute, func() error { return resource.Retry(3*time.Minute, func() error {
log.Printf("[INFO] Deleting DHCP Options ID %s...", d.Id()) log.Printf("[INFO] Deleting DHCP Options ID %s...", d.Id())
_, err := conn.DeleteDHCPOptions(&ec2.DeleteDHCPOptionsInput{ _, err := conn.DeleteDhcpOptions(&ec2.DeleteDhcpOptionsInput{
DHCPOptionsID: aws.String(d.Id()), DhcpOptionsId: aws.String(d.Id()),
}) })
if err == nil { if err == nil {
@ -210,10 +210,10 @@ func resourceAwsVpcDhcpOptionsDelete(d *schema.ResourceData, meta interface{}) e
} }
for _, vpc := range vpcs { for _, vpc := range vpcs {
log.Printf("[INFO] Disassociating DHCP Options Set %s from VPC %s...", d.Id(), *vpc.VPCID) log.Printf("[INFO] Disassociating DHCP Options Set %s from VPC %s...", d.Id(), *vpc.VpcId)
if _, err := conn.AssociateDHCPOptions(&ec2.AssociateDHCPOptionsInput{ if _, err := conn.AssociateDhcpOptions(&ec2.AssociateDhcpOptionsInput{
DHCPOptionsID: aws.String("default"), DhcpOptionsId: aws.String("default"),
VPCID: vpc.VPCID, VpcId: vpc.VpcId,
}); err != nil { }); err != nil {
return err return err
} }
@ -228,8 +228,8 @@ func resourceAwsVpcDhcpOptionsDelete(d *schema.ResourceData, meta interface{}) e
}) })
} }
func findVPCsByDHCPOptionsID(conn *ec2.EC2, id string) ([]*ec2.VPC, error) { func findVPCsByDHCPOptionsID(conn *ec2.EC2, id string) ([]*ec2.Vpc, error) {
req := &ec2.DescribeVPCsInput{ req := &ec2.DescribeVpcsInput{
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
&ec2.Filter{ &ec2.Filter{
Name: aws.String("dhcp-options-id"), Name: aws.String("dhcp-options-id"),
@ -240,7 +240,7 @@ func findVPCsByDHCPOptionsID(conn *ec2.EC2, id string) ([]*ec2.VPC, error) {
}, },
} }
resp, err := conn.DescribeVPCs(req) resp, err := conn.DescribeVpcs(req)
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcID.NotFound" {
return nil, nil return nil, nil
@ -248,18 +248,18 @@ func findVPCsByDHCPOptionsID(conn *ec2.EC2, id string) ([]*ec2.VPC, error) {
return nil, err return nil, err
} }
return resp.VPCs, nil return resp.Vpcs, nil
} }
func DHCPOptionsStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func DHCPOptionsStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
DescribeDhcpOpts := &ec2.DescribeDHCPOptionsInput{ DescribeDhcpOpts := &ec2.DescribeDhcpOptionsInput{
DHCPOptionsIDs: []*string{ DhcpOptionsIds: []*string{
aws.String(id), aws.String(id),
}, },
} }
resp, err := conn.DescribeDHCPOptions(DescribeDhcpOpts) resp, err := conn.DescribeDhcpOptions(DescribeDhcpOpts)
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidDhcpOptionsID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidDhcpOptionsID.NotFound" {
resp = nil resp = nil
@ -275,7 +275,7 @@ func DHCPOptionsStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefresh
return nil, "", nil return nil, "", nil
} }
dos := resp.DHCPOptions[0] dos := resp.DhcpOptions[0]
return dos, "", nil return dos, "", nil
} }
} }

16
builtin/providers/aws/resource_aws_vpc_dhcp_options_association.go
View File

@ -40,9 +40,9 @@ func resourceAwsVpcDhcpOptionsAssociationCreate(d *schema.ResourceData, meta int
optsID := aws.String(d.Get("dhcp_options_id").(string)) optsID := aws.String(d.Get("dhcp_options_id").(string))
vpcID := aws.String(d.Get("vpc_id").(string)) vpcID := aws.String(d.Get("vpc_id").(string))
if _, err := conn.AssociateDHCPOptions(&ec2.AssociateDHCPOptionsInput{ if _, err := conn.AssociateDhcpOptions(&ec2.AssociateDhcpOptionsInput{
DHCPOptionsID: optsID, DhcpOptionsId: optsID,
VPCID: vpcID, VpcId: vpcID,
}); err != nil { }); err != nil {
return err return err
} }
@ -67,8 +67,8 @@ func resourceAwsVpcDhcpOptionsAssociationRead(d *schema.ResourceData, meta inter
return nil return nil
} }
vpc := vpcRaw.(*ec2.VPC) vpc := vpcRaw.(*ec2.Vpc)
if *vpc.VPCID != d.Get("vpc_id") || *vpc.DHCPOptionsID != d.Get("dhcp_options_id") { if *vpc.VpcId != d.Get("vpc_id") || *vpc.DhcpOptionsId != d.Get("dhcp_options_id") {
log.Printf("[INFO] It seems the DHCP Options association is gone. Deleting reference from Graph...") log.Printf("[INFO] It seems the DHCP Options association is gone. Deleting reference from Graph...")
d.SetId("") d.SetId("")
} }
@ -87,9 +87,9 @@ func resourceAwsVpcDhcpOptionsAssociationDelete(d *schema.ResourceData, meta int
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
log.Printf("[INFO] Disassociating DHCP Options Set %s from VPC %s...", d.Get("dhcp_options_id"), d.Get("vpc_id")) log.Printf("[INFO] Disassociating DHCP Options Set %s from VPC %s...", d.Get("dhcp_options_id"), d.Get("vpc_id"))
if _, err := conn.AssociateDHCPOptions(&ec2.AssociateDHCPOptionsInput{ if _, err := conn.AssociateDhcpOptions(&ec2.AssociateDhcpOptionsInput{
DHCPOptionsID: aws.String("default"), DhcpOptionsId: aws.String("default"),
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
}); err != nil { }); err != nil {
return err return err
} }

14
builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go
View File

@ -10,8 +10,8 @@ import (
) )
func TestAccAWSDHCPOptionsAssociation_basic(t *testing.T) { func TestAccAWSDHCPOptionsAssociation_basic(t *testing.T) {
var v ec2.VPC var v ec2.Vpc
var d ec2.DHCPOptions var d ec2.DhcpOptions
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -52,7 +52,7 @@ func testAccCheckDHCPOptionsAssociationDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckDHCPOptionsAssociationExist(n string, vpc *ec2.VPC) resource.TestCheckFunc { func testAccCheckDHCPOptionsAssociationExist(n string, vpc *ec2.Vpc) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -63,12 +63,12 @@ func testAccCheckDHCPOptionsAssociationExist(n string, vpc *ec2.VPC) resource.Te
return fmt.Errorf("No DHCP Options Set association ID is set") return fmt.Errorf("No DHCP Options Set association ID is set")
} }
if *vpc.DHCPOptionsID != rs.Primary.Attributes["dhcp_options_id"] { if *vpc.DhcpOptionsId != rs.Primary.Attributes["dhcp_options_id"] {
return fmt.Errorf("VPC %s does not have DHCP Options Set %s associated", *vpc.VPCID, rs.Primary.Attributes["dhcp_options_id"]) return fmt.Errorf("VPC %s does not have DHCP Options Set %s associated", *vpc.VpcId, rs.Primary.Attributes["dhcp_options_id"])
} }
if *vpc.VPCID != rs.Primary.Attributes["vpc_id"] { if *vpc.VpcId != rs.Primary.Attributes["vpc_id"] {
return fmt.Errorf("DHCP Options Set %s is not associated with VPC %s", rs.Primary.Attributes["dhcp_options_id"], *vpc.VPCID) return fmt.Errorf("DHCP Options Set %s is not associated with VPC %s", rs.Primary.Attributes["dhcp_options_id"], *vpc.VpcId)
} }
return nil return nil

18
builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go
View File

@ -12,7 +12,7 @@ import (
) )
func TestAccAWSDHCPOptions_basic(t *testing.T) { func TestAccAWSDHCPOptions_basic(t *testing.T) {
var d ec2.DHCPOptions var d ec2.DhcpOptions
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -45,13 +45,13 @@ func testAccCheckDHCPOptionsDestroy(s *terraform.State) error {
} }
// Try to find the resource // Try to find the resource
resp, err := conn.DescribeDHCPOptions(&ec2.DescribeDHCPOptionsInput{ resp, err := conn.DescribeDhcpOptions(&ec2.DescribeDhcpOptionsInput{
DHCPOptionsIDs: []*string{ DhcpOptionsIds: []*string{
aws.String(rs.Primary.ID), aws.String(rs.Primary.ID),
}, },
}) })
if err == nil { if err == nil {
if len(resp.DHCPOptions) > 0 { if len(resp.DhcpOptions) > 0 {
return fmt.Errorf("still exist.") return fmt.Errorf("still exist.")
} }
@ -71,7 +71,7 @@ func testAccCheckDHCPOptionsDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckDHCPOptionsExists(n string, d *ec2.DHCPOptions) resource.TestCheckFunc { func testAccCheckDHCPOptionsExists(n string, d *ec2.DhcpOptions) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -83,19 +83,19 @@ func testAccCheckDHCPOptionsExists(n string, d *ec2.DHCPOptions) resource.TestCh
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeDHCPOptions(&ec2.DescribeDHCPOptionsInput{ resp, err := conn.DescribeDhcpOptions(&ec2.DescribeDhcpOptionsInput{
DHCPOptionsIDs: []*string{ DhcpOptionsIds: []*string{
aws.String(rs.Primary.ID), aws.String(rs.Primary.ID),
}, },
}) })
if err != nil { if err != nil {
return err return err
} }
if len(resp.DHCPOptions) == 0 { if len(resp.DhcpOptions) == 0 {
return fmt.Errorf("DHCP Options not found") return fmt.Errorf("DHCP Options not found")
} }
*d = *resp.DHCPOptions[0] *d = *resp.DhcpOptions[0]
return nil return nil
} }

46
builtin/providers/aws/resource_aws_vpc_endpoint.go
View File

@ -48,9 +48,9 @@ func resourceAwsVpcEndpoint() *schema.Resource {
func resourceAwsVPCEndpointCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVPCEndpointCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
input := &ec2.CreateVPCEndpointInput{ input := &ec2.CreateVpcEndpointInput{
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
RouteTableIDs: expandStringList(d.Get("route_table_ids").(*schema.Set).List()), RouteTableIds: expandStringList(d.Get("route_table_ids").(*schema.Set).List()),
ServiceName: aws.String(d.Get("service_name").(string)), ServiceName: aws.String(d.Get("service_name").(string)),
} }
@ -60,25 +60,25 @@ func resourceAwsVPCEndpointCreate(d *schema.ResourceData, meta interface{}) erro
} }
log.Printf("[DEBUG] Creating VPC Endpoint: %#v", input) log.Printf("[DEBUG] Creating VPC Endpoint: %#v", input)
output, err := conn.CreateVPCEndpoint(input) output, err := conn.CreateVpcEndpoint(input)
if err != nil { if err != nil {
return fmt.Errorf("Error creating VPC Endpoint: %s", err) return fmt.Errorf("Error creating VPC Endpoint: %s", err)
} }
log.Printf("[DEBUG] VPC Endpoint %q created.", *output.VPCEndpoint.VPCEndpointID) log.Printf("[DEBUG] VPC Endpoint %q created.", *output.VpcEndpoint.VpcEndpointId)
d.SetId(*output.VPCEndpoint.VPCEndpointID) d.SetId(*output.VpcEndpoint.VpcEndpointId)
return resourceAwsVPCEndpointRead(d, meta) return resourceAwsVPCEndpointRead(d, meta)
} }
func resourceAwsVPCEndpointRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsVPCEndpointRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
input := &ec2.DescribeVPCEndpointsInput{ input := &ec2.DescribeVpcEndpointsInput{
VPCEndpointIDs: []*string{aws.String(d.Id())}, VpcEndpointIds: []*string{aws.String(d.Id())},
} }
log.Printf("[DEBUG] Reading VPC Endpoint: %q", d.Id()) log.Printf("[DEBUG] Reading VPC Endpoint: %q", d.Id())
output, err := conn.DescribeVPCEndpoints(input) output, err := conn.DescribeVpcEndpoints(input)
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)
@ -93,25 +93,25 @@ func resourceAwsVPCEndpointRead(d *schema.ResourceData, meta interface{}) error
return fmt.Errorf("Error reading VPC Endpoint: %s", err.Error()) return fmt.Errorf("Error reading VPC Endpoint: %s", err.Error())
} }
if len(output.VPCEndpoints) != 1 { if len(output.VpcEndpoints) != 1 {
return fmt.Errorf("There's no unique VPC Endpoint, but %d endpoints: %#v", return fmt.Errorf("There's no unique VPC Endpoint, but %d endpoints: %#v",
len(output.VPCEndpoints), output.VPCEndpoints) len(output.VpcEndpoints), output.VpcEndpoints)
} }
vpce := output.VPCEndpoints[0] vpce := output.VpcEndpoints[0]
d.Set("vpc_id", vpce.VPCID) d.Set("vpc_id", vpce.VpcId)
d.Set("policy", normalizeJson(*vpce.PolicyDocument)) d.Set("policy", normalizeJson(*vpce.PolicyDocument))
d.Set("service_name", vpce.ServiceName) d.Set("service_name", vpce.ServiceName)
d.Set("route_table_ids", vpce.RouteTableIDs) d.Set("route_table_ids", vpce.RouteTableIds)
return nil return nil
} }
func resourceAwsVPCEndpointUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVPCEndpointUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
input := &ec2.ModifyVPCEndpointInput{ input := &ec2.ModifyVpcEndpointInput{
VPCEndpointID: aws.String(d.Id()), VpcEndpointId: aws.String(d.Id()),
} }
if d.HasChange("route_table_ids") { if d.HasChange("route_table_ids") {
@ -121,12 +121,12 @@ func resourceAwsVPCEndpointUpdate(d *schema.ResourceData, meta interface{}) erro
add := expandStringList(os.Difference(ns).List()) add := expandStringList(os.Difference(ns).List())
if len(add) > 0 { if len(add) > 0 {
input.AddRouteTableIDs = add input.AddRouteTableIds = add
} }
remove := expandStringList(ns.Difference(os).List()) remove := expandStringList(ns.Difference(os).List())
if len(remove) > 0 { if len(remove) > 0 {
input.RemoveRouteTableIDs = remove input.RemoveRouteTableIds = remove
} }
} }
@ -136,23 +136,23 @@ func resourceAwsVPCEndpointUpdate(d *schema.ResourceData, meta interface{}) erro
} }
log.Printf("[DEBUG] Updating VPC Endpoint: %#v", input) log.Printf("[DEBUG] Updating VPC Endpoint: %#v", input)
_, err := conn.ModifyVPCEndpoint(input) _, err := conn.ModifyVpcEndpoint(input)
if err != nil { if err != nil {
return fmt.Errorf("Error updating VPC Endpoint: %s", err) return fmt.Errorf("Error updating VPC Endpoint: %s", err)
} }
log.Printf("[DEBUG] VPC Endpoint %q updated", input.VPCEndpointID) log.Printf("[DEBUG] VPC Endpoint %q updated", input.VpcEndpointId)
return nil return nil
} }
func resourceAwsVPCEndpointDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsVPCEndpointDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
input := &ec2.DeleteVPCEndpointsInput{ input := &ec2.DeleteVpcEndpointsInput{
VPCEndpointIDs: []*string{aws.String(d.Id())}, VpcEndpointIds: []*string{aws.String(d.Id())},
} }
log.Printf("[DEBUG] Deleting VPC Endpoint: %#v", input) log.Printf("[DEBUG] Deleting VPC Endpoint: %#v", input)
_, err := conn.DeleteVPCEndpoints(input) _, err := conn.DeleteVpcEndpoints(input)
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)

24
builtin/providers/aws/resource_aws_vpc_endpoint_test.go
View File

@ -12,7 +12,7 @@ import (
) )
func TestAccAWSVpcEndpoint_basic(t *testing.T) { func TestAccAWSVpcEndpoint_basic(t *testing.T) {
var endpoint ec2.VPCEndpoint var endpoint ec2.VpcEndpoint
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -30,7 +30,7 @@ func TestAccAWSVpcEndpoint_basic(t *testing.T) {
} }
func TestAccAWSVpcEndpoint_withRouteTableAndPolicy(t *testing.T) { func TestAccAWSVpcEndpoint_withRouteTableAndPolicy(t *testing.T) {
var endpoint ec2.VPCEndpoint var endpoint ec2.VpcEndpoint
var routeTable ec2.RouteTable var routeTable ec2.RouteTable
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
@ -65,12 +65,12 @@ func testAccCheckVpcEndpointDestroy(s *terraform.State) error {
} }
// Try to find the VPC // Try to find the VPC
input := &ec2.DescribeVPCEndpointsInput{ input := &ec2.DescribeVpcEndpointsInput{
VPCEndpointIDs: []*string{aws.String(rs.Primary.ID)}, VpcEndpointIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeVPCEndpoints(input) resp, err := conn.DescribeVpcEndpoints(input)
if len(resp.VPCEndpoints) > 0 { if len(resp.VpcEndpoints) > 0 {
return fmt.Errorf("VPC Endpoints still exist.") return fmt.Errorf("VPC Endpoints still exist.")
} }
@ -80,7 +80,7 @@ func testAccCheckVpcEndpointDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckVpcEndpointExists(n string, endpoint *ec2.VPCEndpoint) resource.TestCheckFunc { func testAccCheckVpcEndpointExists(n string, endpoint *ec2.VpcEndpoint) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -92,18 +92,18 @@ func testAccCheckVpcEndpointExists(n string, endpoint *ec2.VPCEndpoint) resource
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
input := &ec2.DescribeVPCEndpointsInput{ input := &ec2.DescribeVpcEndpointsInput{
VPCEndpointIDs: []*string{aws.String(rs.Primary.ID)}, VpcEndpointIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeVPCEndpoints(input) resp, err := conn.DescribeVpcEndpoints(input)
if err != nil { if err != nil {
return err return err
} }
if len(resp.VPCEndpoints) == 0 { if len(resp.VpcEndpoints) == 0 {
return fmt.Errorf("VPC Endpoint not found") return fmt.Errorf("VPC Endpoint not found")
} }
*endpoint = *resp.VPCEndpoints[0] *endpoint = *resp.VpcEndpoints[0]
return nil return nil
} }

44
builtin/providers/aws/resource_aws_vpc_peering_connection.go
View File

@ -53,20 +53,20 @@ func resourceAwsVPCPeeringCreate(d *schema.ResourceData, meta interface{}) error
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
// Create the vpc peering connection // Create the vpc peering connection
createOpts := &ec2.CreateVPCPeeringConnectionInput{ createOpts := &ec2.CreateVpcPeeringConnectionInput{
PeerOwnerID: aws.String(d.Get("peer_owner_id").(string)), PeerOwnerId: aws.String(d.Get("peer_owner_id").(string)),
PeerVPCID: aws.String(d.Get("peer_vpc_id").(string)), PeerVpcId: aws.String(d.Get("peer_vpc_id").(string)),
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
} }
log.Printf("[DEBUG] VPCPeeringCreate create config: %#v", createOpts) log.Printf("[DEBUG] VPCPeeringCreate create config: %#v", createOpts)
resp, err := conn.CreateVPCPeeringConnection(createOpts) resp, err := conn.CreateVpcPeeringConnection(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating vpc peering connection: %s", err) return fmt.Errorf("Error creating vpc peering connection: %s", err)
} }
// Get the ID and store it // Get the ID and store it
rt := resp.VPCPeeringConnection rt := resp.VpcPeeringConnection
d.SetId(*rt.VPCPeeringConnectionID) d.SetId(*rt.VpcPeeringConnectionId)
log.Printf("[INFO] VPC Peering Connection ID: %s", d.Id()) log.Printf("[INFO] VPC Peering Connection ID: %s", d.Id())
// Wait for the vpc peering connection to become available // Wait for the vpc peering connection to become available
@ -99,7 +99,7 @@ func resourceAwsVPCPeeringRead(d *schema.ResourceData, meta interface{}) error {
return nil return nil
} }
pc := pcRaw.(*ec2.VPCPeeringConnection) pc := pcRaw.(*ec2.VpcPeeringConnection)
// The failed status is a status that we can assume just means the // The failed status is a status that we can assume just means the
// connection is gone. Destruction isn't allowed, and it eventually // connection is gone. Destruction isn't allowed, and it eventually
@ -110,9 +110,9 @@ func resourceAwsVPCPeeringRead(d *schema.ResourceData, meta interface{}) error {
} }
d.Set("accept_status", *pc.Status.Code) d.Set("accept_status", *pc.Status.Code)
d.Set("peer_owner_id", pc.AccepterVPCInfo.OwnerID) d.Set("peer_owner_id", pc.AccepterVpcInfo.OwnerId)
d.Set("peer_vpc_id", pc.AccepterVPCInfo.VPCID) d.Set("peer_vpc_id", pc.AccepterVpcInfo.VpcId)
d.Set("vpc_id", pc.RequesterVPCInfo.VPCID) d.Set("vpc_id", pc.RequesterVpcInfo.VpcId)
d.Set("tags", tagsToMap(pc.Tags)) d.Set("tags", tagsToMap(pc.Tags))
return nil return nil
@ -122,12 +122,12 @@ func resourceVPCPeeringConnectionAccept(conn *ec2.EC2, id string) (string, error
log.Printf("[INFO] Accept VPC Peering Connection with id: %s", id) log.Printf("[INFO] Accept VPC Peering Connection with id: %s", id)
req := &ec2.AcceptVPCPeeringConnectionInput{ req := &ec2.AcceptVpcPeeringConnectionInput{
VPCPeeringConnectionID: aws.String(id), VpcPeeringConnectionId: aws.String(id),
} }
resp, err := conn.AcceptVPCPeeringConnection(req) resp, err := conn.AcceptVpcPeeringConnection(req)
pc := resp.VPCPeeringConnection pc := resp.VpcPeeringConnection
return *pc.Status.Code, err return *pc.Status.Code, err
} }
@ -151,7 +151,7 @@ func resourceAwsVPCPeeringUpdate(d *schema.ResourceData, meta interface{}) error
d.SetId("") d.SetId("")
return nil return nil
} }
pc := pcRaw.(*ec2.VPCPeeringConnection) pc := pcRaw.(*ec2.VpcPeeringConnection)
if *pc.Status.Code == "pending-acceptance" { if *pc.Status.Code == "pending-acceptance" {
@ -172,9 +172,9 @@ func resourceAwsVPCPeeringUpdate(d *schema.ResourceData, meta interface{}) error
func resourceAwsVPCPeeringDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsVPCPeeringDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
_, err := conn.DeleteVPCPeeringConnection( _, err := conn.DeleteVpcPeeringConnection(
&ec2.DeleteVPCPeeringConnectionInput{ &ec2.DeleteVpcPeeringConnectionInput{
VPCPeeringConnectionID: aws.String(d.Id()), VpcPeeringConnectionId: aws.String(d.Id()),
}) })
return err return err
} }
@ -184,8 +184,8 @@ func resourceAwsVPCPeeringDelete(d *schema.ResourceData, meta interface{}) error
func resourceAwsVPCPeeringConnectionStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { func resourceAwsVPCPeeringConnectionStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeVPCPeeringConnections(&ec2.DescribeVPCPeeringConnectionsInput{ resp, err := conn.DescribeVpcPeeringConnections(&ec2.DescribeVpcPeeringConnectionsInput{
VPCPeeringConnectionIDs: []*string{aws.String(id)}, VpcPeeringConnectionIds: []*string{aws.String(id)},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcPeeringConnectionID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcPeeringConnectionID.NotFound" {
@ -202,7 +202,7 @@ func resourceAwsVPCPeeringConnectionStateRefreshFunc(conn *ec2.EC2, id string) r
return nil, "", nil return nil, "", nil
} }
pc := resp.VPCPeeringConnections[0] pc := resp.VpcPeeringConnections[0]
return pc, *pc.Status.Code, nil return pc, *pc.Status.Code, nil
} }

24
builtin/providers/aws/resource_aws_vpc_peering_connection_test.go
View File

@ -12,7 +12,7 @@ import (
) )
func TestAccAWSVPCPeeringConnection_basic(t *testing.T) { func TestAccAWSVPCPeeringConnection_basic(t *testing.T) {
var connection ec2.VPCPeeringConnection var connection ec2.VpcPeeringConnection
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { PreCheck: func() {
@ -35,7 +35,7 @@ func TestAccAWSVPCPeeringConnection_basic(t *testing.T) {
} }
func TestAccAWSVPCPeeringConnection_tags(t *testing.T) { func TestAccAWSVPCPeeringConnection_tags(t *testing.T) {
var connection ec2.VPCPeeringConnection var connection ec2.VpcPeeringConnection
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -61,13 +61,13 @@ func testAccCheckAWSVpcPeeringConnectionDestroy(s *terraform.State) error {
continue continue
} }
describe, err := conn.DescribeVPCPeeringConnections( describe, err := conn.DescribeVpcPeeringConnections(
&ec2.DescribeVPCPeeringConnectionsInput{ &ec2.DescribeVpcPeeringConnectionsInput{
VPCPeeringConnectionIDs: []*string{aws.String(rs.Primary.ID)}, VpcPeeringConnectionIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(describe.VPCPeeringConnections) != 0 { if len(describe.VpcPeeringConnections) != 0 {
return fmt.Errorf("vpc peering connection still exists") return fmt.Errorf("vpc peering connection still exists")
} }
} }
@ -76,7 +76,7 @@ func testAccCheckAWSVpcPeeringConnectionDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VPCPeeringConnection) resource.TestCheckFunc { func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VpcPeeringConnection) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -88,18 +88,18 @@ func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VPCPeer
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := conn.DescribeVPCPeeringConnections( resp, err := conn.DescribeVpcPeeringConnections(
&ec2.DescribeVPCPeeringConnectionsInput{ &ec2.DescribeVpcPeeringConnectionsInput{
VPCPeeringConnectionIDs: []*string{aws.String(rs.Primary.ID)}, VpcPeeringConnectionIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err != nil { if err != nil {
return err return err
} }
if len(resp.VPCPeeringConnections) == 0 { if len(resp.VpcPeeringConnections) == 0 {
return fmt.Errorf("VPC peering connection not found") return fmt.Errorf("VPC peering connection not found")
} }
*connection = *resp.VPCPeeringConnections[0] *connection = *resp.VpcPeeringConnections[0]
return nil return nil
} }

34
builtin/providers/aws/resource_aws_vpc_test.go
View File

@ -12,7 +12,7 @@ import (
) )
func TestAccAWSVpc_basic(t *testing.T) { func TestAccAWSVpc_basic(t *testing.T) {
var vpc ec2.VPC var vpc ec2.Vpc
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -33,7 +33,7 @@ func TestAccAWSVpc_basic(t *testing.T) {
} }
func TestAccAWSVpc_dedicatedTenancy(t *testing.T) { func TestAccAWSVpc_dedicatedTenancy(t *testing.T) {
var vpc ec2.VPC var vpc ec2.Vpc
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -53,7 +53,7 @@ func TestAccAWSVpc_dedicatedTenancy(t *testing.T) {
} }
func TestAccAWSVpc_tags(t *testing.T) { func TestAccAWSVpc_tags(t *testing.T) {
var vpc ec2.VPC var vpc ec2.Vpc
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -84,7 +84,7 @@ func TestAccAWSVpc_tags(t *testing.T) {
} }
func TestAccAWSVpc_update(t *testing.T) { func TestAccAWSVpc_update(t *testing.T) {
var vpc ec2.VPC var vpc ec2.Vpc
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -121,12 +121,12 @@ func testAccCheckVpcDestroy(s *terraform.State) error {
} }
// Try to find the VPC // Try to find the VPC
DescribeVpcOpts := &ec2.DescribeVPCsInput{ DescribeVpcOpts := &ec2.DescribeVpcsInput{
VPCIDs: []*string{aws.String(rs.Primary.ID)}, VpcIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeVPCs(DescribeVpcOpts) resp, err := conn.DescribeVpcs(DescribeVpcOpts)
if err == nil { if err == nil {
if len(resp.VPCs) > 0 { if len(resp.Vpcs) > 0 {
return fmt.Errorf("VPCs still exist.") return fmt.Errorf("VPCs still exist.")
} }
@ -146,18 +146,18 @@ func testAccCheckVpcDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckVpcCidr(vpc *ec2.VPC, expected string) resource.TestCheckFunc { func testAccCheckVpcCidr(vpc *ec2.Vpc, expected string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
CIDRBlock := vpc.CIDRBlock CIDRBlock := vpc.CidrBlock
if *CIDRBlock != expected { if *CIDRBlock != expected {
return fmt.Errorf("Bad cidr: %s", *vpc.CIDRBlock) return fmt.Errorf("Bad cidr: %s", *vpc.CidrBlock)
} }
return nil return nil
} }
} }
func testAccCheckVpcExists(n string, vpc *ec2.VPC) resource.TestCheckFunc { func testAccCheckVpcExists(n string, vpc *ec2.Vpc) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -169,18 +169,18 @@ func testAccCheckVpcExists(n string, vpc *ec2.VPC) resource.TestCheckFunc {
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2conn
DescribeVpcOpts := &ec2.DescribeVPCsInput{ DescribeVpcOpts := &ec2.DescribeVpcsInput{
VPCIDs: []*string{aws.String(rs.Primary.ID)}, VpcIds: []*string{aws.String(rs.Primary.ID)},
} }
resp, err := conn.DescribeVPCs(DescribeVpcOpts) resp, err := conn.DescribeVpcs(DescribeVpcOpts)
if err != nil { if err != nil {
return err return err
} }
if len(resp.VPCs) == 0 { if len(resp.Vpcs) == 0 {
return fmt.Errorf("VPC not found") return fmt.Errorf("VPC not found")
} }
*vpc = *resp.VPCs[0] *vpc = *resp.Vpcs[0]
return nil return nil
} }

54
builtin/providers/aws/resource_aws_vpn_connection.go
View File

@ -142,28 +142,28 @@ func resourceAwsVpnConnection() *schema.Resource {
func resourceAwsVpnConnectionCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnConnectionCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
connectOpts := &ec2.VPNConnectionOptionsSpecification{ connectOpts := &ec2.VpnConnectionOptionsSpecification{
StaticRoutesOnly: aws.Bool(d.Get("static_routes_only").(bool)), StaticRoutesOnly: aws.Bool(d.Get("static_routes_only").(bool)),
} }
createOpts := &ec2.CreateVPNConnectionInput{ createOpts := &ec2.CreateVpnConnectionInput{
CustomerGatewayID: aws.String(d.Get("customer_gateway_id").(string)), CustomerGatewayId: aws.String(d.Get("customer_gateway_id").(string)),
Options: connectOpts, Options: connectOpts,
Type: aws.String(d.Get("type").(string)), Type: aws.String(d.Get("type").(string)),
VPNGatewayID: aws.String(d.Get("vpn_gateway_id").(string)), VpnGatewayId: aws.String(d.Get("vpn_gateway_id").(string)),
} }
// Create the VPN Connection // Create the VPN Connection
log.Printf("[DEBUG] Creating vpn connection") log.Printf("[DEBUG] Creating vpn connection")
resp, err := conn.CreateVPNConnection(createOpts) resp, err := conn.CreateVpnConnection(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating vpn connection: %s", err) return fmt.Errorf("Error creating vpn connection: %s", err)
} }
// Store the ID // Store the ID
vpnConnection := resp.VPNConnection vpnConnection := resp.VpnConnection
d.SetId(*vpnConnection.VPNConnectionID) d.SetId(*vpnConnection.VpnConnectionId)
log.Printf("[INFO] VPN connection ID: %s", *vpnConnection.VPNConnectionID) log.Printf("[INFO] VPN connection ID: %s", *vpnConnection.VpnConnectionId)
// Wait for the connection to become available. This has an obscenely // Wait for the connection to become available. This has an obscenely
// high default timeout because AWS VPN connections are notoriously // high default timeout because AWS VPN connections are notoriously
@ -172,7 +172,7 @@ func resourceAwsVpnConnectionCreate(d *schema.ResourceData, meta interface{}) er
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"pending"}, Pending: []string{"pending"},
Target: "available", Target: "available",
Refresh: vpnConnectionRefreshFunc(conn, *vpnConnection.VPNConnectionID), Refresh: vpnConnectionRefreshFunc(conn, *vpnConnection.VpnConnectionId),
Timeout: 30 * time.Minute, Timeout: 30 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 10 * time.Second, MinTimeout: 10 * time.Second,
@ -182,7 +182,7 @@ func resourceAwsVpnConnectionCreate(d *schema.ResourceData, meta interface{}) er
if stateErr != nil { if stateErr != nil {
return fmt.Errorf( return fmt.Errorf(
"Error waiting for VPN connection (%s) to become ready: %s", "Error waiting for VPN connection (%s) to become ready: %s",
*vpnConnection.VPNConnectionID, err) *vpnConnection.VpnConnectionId, err)
} }
// Create tags. // Create tags.
@ -196,8 +196,8 @@ func resourceAwsVpnConnectionCreate(d *schema.ResourceData, meta interface{}) er
func vpnConnectionRefreshFunc(conn *ec2.EC2, connectionId string) resource.StateRefreshFunc { func vpnConnectionRefreshFunc(conn *ec2.EC2, connectionId string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
resp, err := conn.DescribeVPNConnections(&ec2.DescribeVPNConnectionsInput{ resp, err := conn.DescribeVpnConnections(&ec2.DescribeVpnConnectionsInput{
VPNConnectionIDs: []*string{aws.String(connectionId)}, VpnConnectionIds: []*string{aws.String(connectionId)},
}) })
if err != nil { if err != nil {
@ -209,11 +209,11 @@ func vpnConnectionRefreshFunc(conn *ec2.EC2, connectionId string) resource.State
} }
} }
if resp == nil || len(resp.VPNConnections) == 0 { if resp == nil || len(resp.VpnConnections) == 0 {
return nil, "", nil return nil, "", nil
} }
connection := resp.VPNConnections[0] connection := resp.VpnConnections[0]
return connection, *connection.State, nil return connection, *connection.State, nil
} }
} }
@ -221,8 +221,8 @@ func vpnConnectionRefreshFunc(conn *ec2.EC2, connectionId string) resource.State
func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
resp, err := conn.DescribeVPNConnections(&ec2.DescribeVPNConnectionsInput{ resp, err := conn.DescribeVpnConnections(&ec2.DescribeVpnConnectionsInput{
VPNConnectionIDs: []*string{aws.String(d.Id())}, VpnConnectionIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnConnectionID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnConnectionID.NotFound" {
@ -234,15 +234,15 @@ func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) erro
} }
} }
if len(resp.VPNConnections) != 1 { if len(resp.VpnConnections) != 1 {
return fmt.Errorf("[ERROR] Error finding VPN connection: %s", d.Id()) return fmt.Errorf("[ERROR] Error finding VPN connection: %s", d.Id())
} }
vpnConnection := resp.VPNConnections[0] vpnConnection := resp.VpnConnections[0]
// Set attributes under the user's control. // Set attributes under the user's control.
d.Set("vpn_gateway_id", vpnConnection.VPNGatewayID) d.Set("vpn_gateway_id", vpnConnection.VpnGatewayId)
d.Set("customer_gateway_id", vpnConnection.CustomerGatewayID) d.Set("customer_gateway_id", vpnConnection.CustomerGatewayId)
d.Set("type", vpnConnection.Type) d.Set("type", vpnConnection.Type)
d.Set("tags", tagsToMap(vpnConnection.Tags)) d.Set("tags", tagsToMap(vpnConnection.Tags))
@ -254,7 +254,7 @@ func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) erro
// Set read only attributes. // Set read only attributes.
d.Set("customer_gateway_configuration", vpnConnection.CustomerGatewayConfiguration) d.Set("customer_gateway_configuration", vpnConnection.CustomerGatewayConfiguration)
if err := d.Set("vgw_telemetry", telemetryToMapList(vpnConnection.VGWTelemetry)); err != nil { if err := d.Set("vgw_telemetry", telemetryToMapList(vpnConnection.VgwTelemetry)); err != nil {
return err return err
} }
if vpnConnection.Routes != nil { if vpnConnection.Routes != nil {
@ -282,8 +282,8 @@ func resourceAwsVpnConnectionUpdate(d *schema.ResourceData, meta interface{}) er
func resourceAwsVpnConnectionDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnConnectionDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
_, err := conn.DeleteVPNConnection(&ec2.DeleteVPNConnectionInput{ _, err := conn.DeleteVpnConnection(&ec2.DeleteVpnConnectionInput{
VPNConnectionID: aws.String(d.Id()), VpnConnectionId: aws.String(d.Id()),
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnConnectionID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnConnectionID.NotFound" {
@ -320,11 +320,11 @@ func resourceAwsVpnConnectionDelete(d *schema.ResourceData, meta interface{}) er
} }
// routesToMapList turns the list of routes into a list of maps. // routesToMapList turns the list of routes into a list of maps.
func routesToMapList(routes []*ec2.VPNStaticRoute) []map[string]interface{} { func routesToMapList(routes []*ec2.VpnStaticRoute) []map[string]interface{} {
result := make([]map[string]interface{}, 0, len(routes)) result := make([]map[string]interface{}, 0, len(routes))
for _, r := range routes { for _, r := range routes {
staticRoute := make(map[string]interface{}) staticRoute := make(map[string]interface{})
staticRoute["destination_cidr_block"] = *r.DestinationCIDRBlock staticRoute["destination_cidr_block"] = *r.DestinationCidrBlock
staticRoute["state"] = *r.State staticRoute["state"] = *r.State
if r.Source != nil { if r.Source != nil {
@ -338,12 +338,12 @@ func routesToMapList(routes []*ec2.VPNStaticRoute) []map[string]interface{} {
} }
// telemetryToMapList turns the VGW telemetry into a list of maps. // telemetryToMapList turns the VGW telemetry into a list of maps.
func telemetryToMapList(telemetry []*ec2.VGWTelemetry) []map[string]interface{} { func telemetryToMapList(telemetry []*ec2.VgwTelemetry) []map[string]interface{} {
result := make([]map[string]interface{}, 0, len(telemetry)) result := make([]map[string]interface{}, 0, len(telemetry))
for _, t := range telemetry { for _, t := range telemetry {
vgw := make(map[string]interface{}) vgw := make(map[string]interface{})
vgw["accepted_route_count"] = *t.AcceptedRouteCount vgw["accepted_route_count"] = *t.AcceptedRouteCount
vgw["outside_ip_address"] = *t.OutsideIPAddress vgw["outside_ip_address"] = *t.OutsideIpAddress
vgw["status"] = *t.Status vgw["status"] = *t.Status
vgw["status_message"] = *t.StatusMessage vgw["status_message"] = *t.StatusMessage

4
builtin/providers/aws/resource_aws_vpn_connection_test.go
View File

@ -72,8 +72,8 @@ func testAccAwsVpnConnection(
ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn
_, err := ec2conn.DescribeVPNConnections(&ec2.DescribeVPNConnectionsInput{ _, err := ec2conn.DescribeVpnConnections(&ec2.DescribeVpnConnectionsInput{
VPNConnectionIDs: []*string{aws.String(connection.Primary.ID)}, VpnConnectionIds: []*string{aws.String(connection.Primary.ID)},
}) })
if err != nil { if err != nil {

46
builtin/providers/aws/resource_aws_vpn_gateway.go
View File

@ -39,22 +39,22 @@ func resourceAwsVpnGateway() *schema.Resource {
func resourceAwsVpnGatewayCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnGatewayCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
createOpts := &ec2.CreateVPNGatewayInput{ createOpts := &ec2.CreateVpnGatewayInput{
AvailabilityZone: aws.String(d.Get("availability_zone").(string)), AvailabilityZone: aws.String(d.Get("availability_zone").(string)),
Type: aws.String("ipsec.1"), Type: aws.String("ipsec.1"),
} }
// Create the VPN gateway // Create the VPN gateway
log.Printf("[DEBUG] Creating VPN gateway") log.Printf("[DEBUG] Creating VPN gateway")
resp, err := conn.CreateVPNGateway(createOpts) resp, err := conn.CreateVpnGateway(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating VPN gateway: %s", err) return fmt.Errorf("Error creating VPN gateway: %s", err)
} }
// Get the ID and store it // Get the ID and store it
vpnGateway := resp.VPNGateway vpnGateway := resp.VpnGateway
d.SetId(*vpnGateway.VPNGatewayID) d.SetId(*vpnGateway.VpnGatewayId)
log.Printf("[INFO] VPN Gateway ID: %s", *vpnGateway.VPNGatewayID) log.Printf("[INFO] VPN Gateway ID: %s", *vpnGateway.VpnGatewayId)
// Attach the VPN gateway to the correct VPC // Attach the VPN gateway to the correct VPC
return resourceAwsVpnGatewayUpdate(d, meta) return resourceAwsVpnGatewayUpdate(d, meta)
@ -63,8 +63,8 @@ func resourceAwsVpnGatewayCreate(d *schema.ResourceData, meta interface{}) error
func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
resp, err := conn.DescribeVPNGateways(&ec2.DescribeVPNGatewaysInput{ resp, err := conn.DescribeVpnGateways(&ec2.DescribeVpnGatewaysInput{
VPNGatewayIDs: []*string{aws.String(d.Id())}, VpnGatewayIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnGatewayID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnGatewayID.NotFound" {
@ -76,18 +76,18 @@ func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error {
} }
} }
vpnGateway := resp.VPNGateways[0] vpnGateway := resp.VpnGateways[0]
if vpnGateway == nil { if vpnGateway == nil {
// Seems we have lost our VPN gateway // Seems we have lost our VPN gateway
d.SetId("") d.SetId("")
return nil return nil
} }
if len(vpnGateway.VPCAttachments) == 0 { if len(vpnGateway.VpcAttachments) == 0 {
// Gateway exists but not attached to the VPC // Gateway exists but not attached to the VPC
d.Set("vpc_id", "") d.Set("vpc_id", "")
} else { } else {
d.Set("vpc_id", vpnGateway.VPCAttachments[0].VPCID) d.Set("vpc_id", vpnGateway.VpcAttachments[0].VpcId)
} }
d.Set("availability_zone", vpnGateway.AvailabilityZone) d.Set("availability_zone", vpnGateway.AvailabilityZone)
d.Set("tags", tagsToMap(vpnGateway.Tags)) d.Set("tags", tagsToMap(vpnGateway.Tags))
@ -130,8 +130,8 @@ func resourceAwsVpnGatewayDelete(d *schema.ResourceData, meta interface{}) error
log.Printf("[INFO] Deleting VPN gateway: %s", d.Id()) log.Printf("[INFO] Deleting VPN gateway: %s", d.Id())
return resource.Retry(5*time.Minute, func() error { return resource.Retry(5*time.Minute, func() error {
_, err := conn.DeleteVPNGateway(&ec2.DeleteVPNGatewayInput{ _, err := conn.DeleteVpnGateway(&ec2.DeleteVpnGatewayInput{
VPNGatewayID: aws.String(d.Id()), VpnGatewayId: aws.String(d.Id()),
}) })
if err == nil { if err == nil {
return nil return nil
@ -168,9 +168,9 @@ func resourceAwsVpnGatewayAttach(d *schema.ResourceData, meta interface{}) error
d.Id(), d.Id(),
d.Get("vpc_id").(string)) d.Get("vpc_id").(string))
_, err := conn.AttachVPNGateway(&ec2.AttachVPNGatewayInput{ _, err := conn.AttachVpnGateway(&ec2.AttachVpnGatewayInput{
VPNGatewayID: aws.String(d.Id()), VpnGatewayId: aws.String(d.Id()),
VPCID: aws.String(d.Get("vpc_id").(string)), VpcId: aws.String(d.Get("vpc_id").(string)),
}) })
if err != nil { if err != nil {
return err return err
@ -217,9 +217,9 @@ func resourceAwsVpnGatewayDetach(d *schema.ResourceData, meta interface{}) error
vpcID.(string)) vpcID.(string))
wait := true wait := true
_, err := conn.DetachVPNGateway(&ec2.DetachVPNGatewayInput{ _, err := conn.DetachVpnGateway(&ec2.DetachVpnGatewayInput{
VPNGatewayID: aws.String(d.Id()), VpnGatewayId: aws.String(d.Id()),
VPCID: aws.String(vpcID.(string)), VpcId: aws.String(vpcID.(string)),
}) })
if err != nil { if err != nil {
ec2err, ok := err.(awserr.Error) ec2err, ok := err.(awserr.Error)
@ -268,8 +268,8 @@ func vpnGatewayAttachStateRefreshFunc(conn *ec2.EC2, id string, expected string)
start = time.Now() start = time.Now()
} }
resp, err := conn.DescribeVPNGateways(&ec2.DescribeVPNGatewaysInput{ resp, err := conn.DescribeVpnGateways(&ec2.DescribeVpnGatewaysInput{
VPNGatewayIDs: []*string{aws.String(id)}, VpnGatewayIds: []*string{aws.String(id)},
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnGatewayID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnGatewayID.NotFound" {
@ -286,17 +286,17 @@ func vpnGatewayAttachStateRefreshFunc(conn *ec2.EC2, id string, expected string)
return nil, "", nil return nil, "", nil
} }
vpnGateway := resp.VPNGateways[0] vpnGateway := resp.VpnGateways[0]
if time.Now().Sub(start) > 10*time.Second { if time.Now().Sub(start) > 10*time.Second {
return vpnGateway, expected, nil return vpnGateway, expected, nil
} }
if len(vpnGateway.VPCAttachments) == 0 { if len(vpnGateway.VpcAttachments) == 0 {
// No attachments, we're detached // No attachments, we're detached
return vpnGateway, "detached", nil return vpnGateway, "detached", nil
} }
return vpnGateway, *vpnGateway.VPCAttachments[0].State, nil return vpnGateway, *vpnGateway.VpcAttachments[0].State, nil
} }
} }

30
builtin/providers/aws/resource_aws_vpn_gateway_test.go
View File

@ -12,18 +12,18 @@ import (
) )
func TestAccAWSVpnGateway_basic(t *testing.T) { func TestAccAWSVpnGateway_basic(t *testing.T) {
var v, v2 ec2.VPNGateway var v, v2 ec2.VpnGateway
testNotEqual := func(*terraform.State) error { testNotEqual := func(*terraform.State) error {
if len(v.VPCAttachments) == 0 { if len(v.VpcAttachments) == 0 {
return fmt.Errorf("VPN gateway A is not attached") return fmt.Errorf("VPN gateway A is not attached")
} }
if len(v2.VPCAttachments) == 0 { if len(v2.VpcAttachments) == 0 {
return fmt.Errorf("VPN gateway B is not attached") return fmt.Errorf("VPN gateway B is not attached")
} }
id1 := v.VPCAttachments[0].VPCID id1 := v.VpcAttachments[0].VpcId
id2 := v2.VPCAttachments[0].VPCID id2 := v2.VpcAttachments[0].VpcId
if id1 == id2 { if id1 == id2 {
return fmt.Errorf("Both attachment IDs are the same") return fmt.Errorf("Both attachment IDs are the same")
} }
@ -57,7 +57,7 @@ func TestAccAWSVpnGateway_basic(t *testing.T) {
} }
func TestAccAWSVpnGateway_delete(t *testing.T) { func TestAccAWSVpnGateway_delete(t *testing.T) {
var vpnGateway ec2.VPNGateway var vpnGateway ec2.VpnGateway
testDeleted := func(r string) resource.TestCheckFunc { testDeleted := func(r string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
@ -88,7 +88,7 @@ func TestAccAWSVpnGateway_delete(t *testing.T) {
} }
func TestAccAWSVpnGateway_tags(t *testing.T) { func TestAccAWSVpnGateway_tags(t *testing.T) {
var v ec2.VPNGateway var v ec2.VpnGateway
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -124,11 +124,11 @@ func testAccCheckVpnGatewayDestroy(s *terraform.State) error {
} }
// Try to find the resource // Try to find the resource
resp, err := ec2conn.DescribeVPNGateways(&ec2.DescribeVPNGatewaysInput{ resp, err := ec2conn.DescribeVpnGateways(&ec2.DescribeVpnGatewaysInput{
VPNGatewayIDs: []*string{aws.String(rs.Primary.ID)}, VpnGatewayIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.VPNGateways) > 0 { if len(resp.VpnGateways) > 0 {
return fmt.Errorf("still exists") return fmt.Errorf("still exists")
} }
@ -148,7 +148,7 @@ func testAccCheckVpnGatewayDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckVpnGatewayExists(n string, ig *ec2.VPNGateway) resource.TestCheckFunc { func testAccCheckVpnGatewayExists(n string, ig *ec2.VpnGateway) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -160,17 +160,17 @@ func testAccCheckVpnGatewayExists(n string, ig *ec2.VPNGateway) resource.TestChe
} }
ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn
resp, err := ec2conn.DescribeVPNGateways(&ec2.DescribeVPNGatewaysInput{ resp, err := ec2conn.DescribeVpnGateways(&ec2.DescribeVpnGatewaysInput{
VPNGatewayIDs: []*string{aws.String(rs.Primary.ID)}, VpnGatewayIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err != nil { if err != nil {
return err return err
} }
if len(resp.VPNGateways) == 0 { if len(resp.VpnGateways) == 0 {
return fmt.Errorf("VPNGateway not found") return fmt.Errorf("VPNGateway not found")
} }
*ig = *resp.VPNGateways[0] *ig = *resp.VpnGateways[0]
return nil return nil
} }

28
builtin/providers/aws/resource_vpn_connection_route.go
View File

@ -41,20 +41,20 @@ func resourceAwsVpnConnectionRoute() *schema.Resource {
func resourceAwsVpnConnectionRouteCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnConnectionRouteCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
createOpts := &ec2.CreateVPNConnectionRouteInput{ createOpts := &ec2.CreateVpnConnectionRouteInput{
DestinationCIDRBlock: aws.String(d.Get("destination_cidr_block").(string)), DestinationCidrBlock: aws.String(d.Get("destination_cidr_block").(string)),
VPNConnectionID: aws.String(d.Get("vpn_connection_id").(string)), VpnConnectionId: aws.String(d.Get("vpn_connection_id").(string)),
} }
// Create the route. // Create the route.
log.Printf("[DEBUG] Creating VPN connection route") log.Printf("[DEBUG] Creating VPN connection route")
_, err := conn.CreateVPNConnectionRoute(createOpts) _, err := conn.CreateVpnConnectionRoute(createOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error creating VPN connection route: %s", err) return fmt.Errorf("Error creating VPN connection route: %s", err)
} }
// Store the ID by the only two data we have available to us. // Store the ID by the only two data we have available to us.
d.SetId(fmt.Sprintf("%s:%s", *createOpts.DestinationCIDRBlock, *createOpts.VPNConnectionID)) d.SetId(fmt.Sprintf("%s:%s", *createOpts.DestinationCidrBlock, *createOpts.VpnConnectionId))
return resourceAwsVpnConnectionRouteRead(d, meta) return resourceAwsVpnConnectionRouteRead(d, meta)
} }
@ -79,7 +79,7 @@ func resourceAwsVpnConnectionRouteRead(d *schema.ResourceData, meta interface{})
// from its ID, but we still want to catch cases where it changes // from its ID, but we still want to catch cases where it changes
// outside of terraform and results in a stale state file. Hence, // outside of terraform and results in a stale state file. Hence,
// conduct a read. // conduct a read.
resp, err := conn.DescribeVPNConnections(&ec2.DescribeVPNConnectionsInput{ resp, err := conn.DescribeVpnConnections(&ec2.DescribeVpnConnectionsInput{
Filters: routeFilters, Filters: routeFilters,
}) })
if err != nil { if err != nil {
@ -91,20 +91,20 @@ func resourceAwsVpnConnectionRouteRead(d *schema.ResourceData, meta interface{})
return err return err
} }
} }
if resp == nil || len(resp.VPNConnections) == 0 { if resp == nil || len(resp.VpnConnections) == 0 {
// This is kind of a weird edge case. I'd rather return an error // This is kind of a weird edge case. I'd rather return an error
// instead of just blindly setting the ID to ""... since I don't know // instead of just blindly setting the ID to ""... since I don't know
// what might cause this. // what might cause this.
return fmt.Errorf("No VPN connections returned") return fmt.Errorf("No VPN connections returned")
} }
vpnConnection := resp.VPNConnections[0] vpnConnection := resp.VpnConnections[0]
var found bool var found bool
for _, r := range vpnConnection.Routes { for _, r := range vpnConnection.Routes {
if *r.DestinationCIDRBlock == cidrBlock { if *r.DestinationCidrBlock == cidrBlock {
d.Set("destination_cidr_block", *r.DestinationCIDRBlock) d.Set("destination_cidr_block", *r.DestinationCidrBlock)
d.Set("vpn_connection_id", *vpnConnection.VPNConnectionID) d.Set("vpn_connection_id", *vpnConnection.VpnConnectionId)
found = true found = true
} }
} }
@ -119,9 +119,9 @@ func resourceAwsVpnConnectionRouteRead(d *schema.ResourceData, meta interface{})
func resourceAwsVpnConnectionRouteDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpnConnectionRouteDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
_, err := conn.DeleteVPNConnectionRoute(&ec2.DeleteVPNConnectionRouteInput{ _, err := conn.DeleteVpnConnectionRoute(&ec2.DeleteVpnConnectionRouteInput{
DestinationCIDRBlock: aws.String(d.Get("destination_cidr_block").(string)), DestinationCidrBlock: aws.String(d.Get("destination_cidr_block").(string)),
VPNConnectionID: aws.String(d.Get("vpn_connection_id").(string)), VpnConnectionId: aws.String(d.Get("vpn_connection_id").(string)),
}) })
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnConnectionID.NotFound" { if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpnConnectionID.NotFound" {

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

@ -85,7 +85,7 @@ func testAccAwsVpnConnectionRoute(
ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn
_, err := ec2conn.DescribeVPNConnections(&ec2.DescribeVPNConnectionsInput{ _, err := ec2conn.DescribeVpnConnections(&ec2.DescribeVpnConnectionsInput{
Filters: routeFilters, Filters: routeFilters,
}) })
if err != nil { if err != nil {

60
builtin/providers/aws/structure.go
View File

@ -37,7 +37,7 @@ func expandListeners(configured []interface{}) ([]*elb.Listener, error) {
} }
if v, ok := data["ssl_certificate_id"]; ok { if v, ok := data["ssl_certificate_id"]; ok {
l.SSLCertificateID = aws.String(v.(string)) l.SSLCertificateId = aws.String(v.(string))
} }
listeners = append(listeners, l) listeners = append(listeners, l)
@ -109,24 +109,24 @@ func expandEcsLoadBalancers(configured []interface{}) []*ecs.LoadBalancer {
// if it finds invalid permissions input, namely a protocol of "-1" with either // if it finds invalid permissions input, namely a protocol of "-1" with either
// to_port or from_port set to a non-zero value. // to_port or from_port set to a non-zero value.
func expandIPPerms( func expandIPPerms(
group *ec2.SecurityGroup, configured []interface{}) ([]*ec2.IPPermission, error) { group *ec2.SecurityGroup, configured []interface{}) ([]*ec2.IpPermission, error) {
vpc := group.VPCID != nil vpc := group.VpcId != nil
perms := make([]*ec2.IPPermission, len(configured)) perms := make([]*ec2.IpPermission, len(configured))
for i, mRaw := range configured { for i, mRaw := range configured {
var perm ec2.IPPermission var perm ec2.IpPermission
m := mRaw.(map[string]interface{}) m := mRaw.(map[string]interface{})
perm.FromPort = aws.Int64(int64(m["from_port"].(int))) perm.FromPort = aws.Int64(int64(m["from_port"].(int)))
perm.ToPort = aws.Int64(int64(m["to_port"].(int))) perm.ToPort = aws.Int64(int64(m["to_port"].(int)))
perm.IPProtocol = aws.String(m["protocol"].(string)) perm.IpProtocol = aws.String(m["protocol"].(string))
// When protocol is "-1", AWS won't store any ports for the // When protocol is "-1", AWS won't store any ports for the
// rule, but also won't error if the user specifies ports other // rule, but also won't error if the user specifies ports other
// than '0'. Force the user to make a deliberate '0' port // than '0'. Force the user to make a deliberate '0' port
// choice when specifying a "-1" protocol, and tell them about // choice when specifying a "-1" protocol, and tell them about
// AWS's behavior in the error message. // AWS's behavior in the error message.
if *perm.IPProtocol == "-1" && (*perm.FromPort != 0 || *perm.ToPort != 0) { if *perm.IpProtocol == "-1" && (*perm.FromPort != 0 || *perm.ToPort != 0) {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"from_port (%d) and to_port (%d) must both be 0 to use the the 'ALL' \"-1\" protocol!", "from_port (%d) and to_port (%d) must both be 0 to use the the 'ALL' \"-1\" protocol!",
*perm.FromPort, *perm.ToPort) *perm.FromPort, *perm.ToPort)
@ -141,31 +141,31 @@ func expandIPPerms(
} }
if v, ok := m["self"]; ok && v.(bool) { if v, ok := m["self"]; ok && v.(bool) {
if vpc { if vpc {
groups = append(groups, *group.GroupID) groups = append(groups, *group.GroupId)
} else { } else {
groups = append(groups, *group.GroupName) groups = append(groups, *group.GroupName)
} }
} }
if len(groups) > 0 { if len(groups) > 0 {
perm.UserIDGroupPairs = make([]*ec2.UserIDGroupPair, len(groups)) perm.UserIdGroupPairs = make([]*ec2.UserIdGroupPair, len(groups))
for i, name := range groups { for i, name := range groups {
ownerId, id := "", name ownerId, id := "", name
if items := strings.Split(id, "/"); len(items) > 1 { if items := strings.Split(id, "/"); len(items) > 1 {
ownerId, id = items[0], items[1] ownerId, id = items[0], items[1]
} }
perm.UserIDGroupPairs[i] = &ec2.UserIDGroupPair{ perm.UserIdGroupPairs[i] = &ec2.UserIdGroupPair{
GroupID: aws.String(id), GroupId: aws.String(id),
} }
if ownerId != "" { if ownerId != "" {
perm.UserIDGroupPairs[i].UserID = aws.String(ownerId) perm.UserIdGroupPairs[i].UserId = aws.String(ownerId)
} }
if !vpc { if !vpc {
perm.UserIDGroupPairs[i].GroupID = nil perm.UserIdGroupPairs[i].GroupId = nil
perm.UserIDGroupPairs[i].GroupName = aws.String(id) perm.UserIdGroupPairs[i].GroupName = aws.String(id)
} }
} }
} }
@ -173,7 +173,7 @@ func expandIPPerms(
if raw, ok := m["cidr_blocks"]; ok { if raw, ok := m["cidr_blocks"]; ok {
list := raw.([]interface{}) list := raw.([]interface{})
for _, v := range list { for _, v := range list {
perm.IPRanges = append(perm.IPRanges, &ec2.IPRange{CIDRIP: aws.String(v.(string))}) perm.IpRanges = append(perm.IpRanges, &ec2.IpRange{CidrIp: aws.String(v.(string))})
} }
} }
@ -248,10 +248,10 @@ func flattenHealthCheck(check *elb.HealthCheck) []map[string]interface{} {
} }
// Flattens an array of UserSecurityGroups into a []string // Flattens an array of UserSecurityGroups into a []string
func flattenSecurityGroups(list []*ec2.UserIDGroupPair) []string { func flattenSecurityGroups(list []*ec2.UserIdGroupPair) []string {
result := make([]string, 0, len(list)) result := make([]string, 0, len(list))
for _, g := range list { for _, g := range list {
result = append(result, *g.GroupID) result = append(result, *g.GroupId)
} }
return result return result
} }
@ -260,7 +260,7 @@ func flattenSecurityGroups(list []*ec2.UserIDGroupPair) []string {
func flattenInstances(list []*elb.Instance) []string { func flattenInstances(list []*elb.Instance) []string {
result := make([]string, 0, len(list)) result := make([]string, 0, len(list))
for _, i := range list { for _, i := range list {
result = append(result, *i.InstanceID) result = append(result, *i.InstanceId)
} }
return result return result
} }
@ -269,7 +269,7 @@ func flattenInstances(list []*elb.Instance) []string {
func expandInstanceString(list []interface{}) []*elb.Instance { func expandInstanceString(list []interface{}) []*elb.Instance {
result := make([]*elb.Instance, 0, len(list)) result := make([]*elb.Instance, 0, len(list))
for _, i := range list { for _, i := range list {
result = append(result, &elb.Instance{InstanceID: aws.String(i.(string))}) result = append(result, &elb.Instance{InstanceId: aws.String(i.(string))})
} }
return result return result
} }
@ -297,8 +297,8 @@ func flattenListeners(list []*elb.ListenerDescription) []map[string]interface{}
"lb_protocol": strings.ToLower(*i.Listener.Protocol), "lb_protocol": strings.ToLower(*i.Listener.Protocol),
} }
// SSLCertificateID is optional, and may be nil // SSLCertificateID is optional, and may be nil
if i.Listener.SSLCertificateID != nil { if i.Listener.SSLCertificateId != nil {
l["ssl_certificate_id"] = *i.Listener.SSLCertificateID l["ssl_certificate_id"] = *i.Listener.SSLCertificateId
} }
result = append(result, l) result = append(result, l)
} }
@ -378,10 +378,10 @@ func expandStringList(configured []interface{}) []*string {
} }
//Flattens an array of private ip addresses into a []string, where the elements returned are the IP strings e.g. "192.168.0.0" //Flattens an array of private ip addresses into a []string, where the elements returned are the IP strings e.g. "192.168.0.0"
func flattenNetworkInterfacesPrivateIPAddesses(dtos []*ec2.NetworkInterfacePrivateIPAddress) []string { func flattenNetworkInterfacesPrivateIPAddesses(dtos []*ec2.NetworkInterfacePrivateIpAddress) []string {
ips := make([]string, 0, len(dtos)) ips := make([]string, 0, len(dtos))
for _, v := range dtos { for _, v := range dtos {
ip := *v.PrivateIPAddress ip := *v.PrivateIpAddress
ips = append(ips, ip) ips = append(ips, ip)
} }
return ips return ips
@ -391,18 +391,18 @@ func flattenNetworkInterfacesPrivateIPAddesses(dtos []*ec2.NetworkInterfacePriva
func flattenGroupIdentifiers(dtos []*ec2.GroupIdentifier) []string { func flattenGroupIdentifiers(dtos []*ec2.GroupIdentifier) []string {
ids := make([]string, 0, len(dtos)) ids := make([]string, 0, len(dtos))
for _, v := range dtos { for _, v := range dtos {
group_id := *v.GroupID group_id := *v.GroupId
ids = append(ids, group_id) ids = append(ids, group_id)
} }
return ids return ids
} }
//Expands an array of IPs into a ec2 Private IP Address Spec //Expands an array of IPs into a ec2 Private IP Address Spec
func expandPrivateIPAddesses(ips []interface{}) []*ec2.PrivateIPAddressSpecification { func expandPrivateIPAddesses(ips []interface{}) []*ec2.PrivateIpAddressSpecification {
dtos := make([]*ec2.PrivateIPAddressSpecification, 0, len(ips)) dtos := make([]*ec2.PrivateIpAddressSpecification, 0, len(ips))
for i, v := range ips { for i, v := range ips {
new_private_ip := &ec2.PrivateIPAddressSpecification{ new_private_ip := &ec2.PrivateIpAddressSpecification{
PrivateIPAddress: aws.String(v.(string)), PrivateIpAddress: aws.String(v.(string)),
} }
new_private_ip.Primary = aws.Bool(i == 0) new_private_ip.Primary = aws.Bool(i == 0)
@ -415,9 +415,9 @@ func expandPrivateIPAddesses(ips []interface{}) []*ec2.PrivateIPAddressSpecifica
//Flattens network interface attachment into a map[string]interface //Flattens network interface attachment into a map[string]interface
func flattenAttachment(a *ec2.NetworkInterfaceAttachment) map[string]interface{} { func flattenAttachment(a *ec2.NetworkInterfaceAttachment) map[string]interface{} {
att := make(map[string]interface{}) att := make(map[string]interface{})
att["instance"] = *a.InstanceID att["instance"] = *a.InstanceId
att["device_index"] = *a.DeviceIndex att["device_index"] = *a.DeviceIndex
att["attachment_id"] = *a.AttachmentID att["attachment_id"] = *a.AttachmentId
return att return att
} }

140
builtin/providers/aws/structure_test.go
View File

@ -59,37 +59,37 @@ func TestexpandIPPerms(t *testing.T) {
}, },
} }
group := &ec2.SecurityGroup{ group := &ec2.SecurityGroup{
GroupID: aws.String("foo"), GroupId: aws.String("foo"),
VPCID: aws.String("bar"), VpcId: aws.String("bar"),
} }
perms, err := expandIPPerms(group, expanded) perms, err := expandIPPerms(group, expanded)
if err != nil { if err != nil {
t.Fatalf("error expanding perms: %v", err) t.Fatalf("error expanding perms: %v", err)
} }
expected := []ec2.IPPermission{ expected := []ec2.IpPermission{
ec2.IPPermission{ ec2.IpPermission{
IPProtocol: aws.String("icmp"), IpProtocol: aws.String("icmp"),
FromPort: aws.Int64(int64(1)), FromPort: aws.Int64(int64(1)),
ToPort: aws.Int64(int64(-1)), ToPort: aws.Int64(int64(-1)),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("0.0.0.0/0")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("0.0.0.0/0")}},
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("foo"), UserId: aws.String("foo"),
GroupID: aws.String("sg-22222"), GroupId: aws.String("sg-22222"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
GroupID: aws.String("sg-22222"), GroupId: aws.String("sg-22222"),
}, },
}, },
}, },
ec2.IPPermission{ ec2.IpPermission{
IPProtocol: aws.String("icmp"), IpProtocol: aws.String("icmp"),
FromPort: aws.Int64(int64(1)), FromPort: aws.Int64(int64(1)),
ToPort: aws.Int64(int64(-1)), ToPort: aws.Int64(int64(-1)),
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("foo"), UserId: aws.String("foo"),
}, },
}, },
}, },
@ -105,18 +105,18 @@ func TestexpandIPPerms(t *testing.T) {
*exp.FromPort) *exp.FromPort)
} }
if *exp.IPRanges[0].CIDRIP != *perm.IPRanges[0].CIDRIP { if *exp.IpRanges[0].CidrIp != *perm.IpRanges[0].CidrIp {
t.Fatalf( t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.IPRanges[0].CIDRIP, *perm.IpRanges[0].CidrIp,
*exp.IPRanges[0].CIDRIP) *exp.IpRanges[0].CidrIp)
} }
if *exp.UserIDGroupPairs[0].UserID != *perm.UserIDGroupPairs[0].UserID { if *exp.UserIdGroupPairs[0].UserId != *perm.UserIdGroupPairs[0].UserId {
t.Fatalf( t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIDGroupPairs[0].UserID, *perm.UserIdGroupPairs[0].UserId,
*exp.UserIDGroupPairs[0].UserID) *exp.UserIdGroupPairs[0].UserId)
} }
} }
@ -137,8 +137,8 @@ func TestExpandIPPerms_NegOneProtocol(t *testing.T) {
}, },
} }
group := &ec2.SecurityGroup{ group := &ec2.SecurityGroup{
GroupID: aws.String("foo"), GroupId: aws.String("foo"),
VPCID: aws.String("bar"), VpcId: aws.String("bar"),
} }
perms, err := expandIPPerms(group, expanded) perms, err := expandIPPerms(group, expanded)
@ -146,19 +146,19 @@ func TestExpandIPPerms_NegOneProtocol(t *testing.T) {
t.Fatalf("error expanding perms: %v", err) t.Fatalf("error expanding perms: %v", err)
} }
expected := []ec2.IPPermission{ expected := []ec2.IpPermission{
ec2.IPPermission{ ec2.IpPermission{
IPProtocol: aws.String("-1"), IpProtocol: aws.String("-1"),
FromPort: aws.Int64(int64(0)), FromPort: aws.Int64(int64(0)),
ToPort: aws.Int64(int64(0)), ToPort: aws.Int64(int64(0)),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("0.0.0.0/0")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("0.0.0.0/0")}},
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
UserID: aws.String("foo"), UserId: aws.String("foo"),
GroupID: aws.String("sg-22222"), GroupId: aws.String("sg-22222"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
GroupID: aws.String("sg-22222"), GroupId: aws.String("sg-22222"),
}, },
}, },
}, },
@ -174,18 +174,18 @@ func TestExpandIPPerms_NegOneProtocol(t *testing.T) {
*exp.FromPort) *exp.FromPort)
} }
if *exp.IPRanges[0].CIDRIP != *perm.IPRanges[0].CIDRIP { if *exp.IpRanges[0].CidrIp != *perm.IpRanges[0].CidrIp {
t.Fatalf( t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.IPRanges[0].CIDRIP, *perm.IpRanges[0].CidrIp,
*exp.IPRanges[0].CIDRIP) *exp.IpRanges[0].CidrIp)
} }
if *exp.UserIDGroupPairs[0].UserID != *perm.UserIDGroupPairs[0].UserID { if *exp.UserIdGroupPairs[0].UserId != *perm.UserIdGroupPairs[0].UserId {
t.Fatalf( t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIDGroupPairs[0].UserID, *perm.UserIdGroupPairs[0].UserId,
*exp.UserIDGroupPairs[0].UserID) *exp.UserIdGroupPairs[0].UserId)
} }
// Now test the error case. This *should* error when either from_port // Now test the error case. This *should* error when either from_port
@ -203,8 +203,8 @@ func TestExpandIPPerms_NegOneProtocol(t *testing.T) {
}, },
} }
securityGroups := &ec2.SecurityGroup{ securityGroups := &ec2.SecurityGroup{
GroupID: aws.String("foo"), GroupId: aws.String("foo"),
VPCID: aws.String("bar"), VpcId: aws.String("bar"),
} }
_, expandErr := expandIPPerms(securityGroups, errorCase) _, expandErr := expandIPPerms(securityGroups, errorCase)
@ -242,27 +242,27 @@ func TestExpandIPPerms_nonVPC(t *testing.T) {
t.Fatalf("error expanding perms: %v", err) t.Fatalf("error expanding perms: %v", err)
} }
expected := []ec2.IPPermission{ expected := []ec2.IpPermission{
ec2.IPPermission{ ec2.IpPermission{
IPProtocol: aws.String("icmp"), IpProtocol: aws.String("icmp"),
FromPort: aws.Int64(int64(1)), FromPort: aws.Int64(int64(1)),
ToPort: aws.Int64(int64(-1)), ToPort: aws.Int64(int64(-1)),
IPRanges: []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("0.0.0.0/0")}}, IpRanges: []*ec2.IpRange{&ec2.IpRange{CidrIp: aws.String("0.0.0.0/0")}},
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
GroupName: aws.String("sg-22222"), GroupName: aws.String("sg-22222"),
}, },
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
GroupName: aws.String("sg-22222"), GroupName: aws.String("sg-22222"),
}, },
}, },
}, },
ec2.IPPermission{ ec2.IpPermission{
IPProtocol: aws.String("icmp"), IpProtocol: aws.String("icmp"),
FromPort: aws.Int64(int64(1)), FromPort: aws.Int64(int64(1)),
ToPort: aws.Int64(int64(-1)), ToPort: aws.Int64(int64(-1)),
UserIDGroupPairs: []*ec2.UserIDGroupPair{ UserIdGroupPairs: []*ec2.UserIdGroupPair{
&ec2.UserIDGroupPair{ &ec2.UserIdGroupPair{
GroupName: aws.String("foo"), GroupName: aws.String("foo"),
}, },
}, },
@ -279,11 +279,11 @@ func TestExpandIPPerms_nonVPC(t *testing.T) {
*exp.FromPort) *exp.FromPort)
} }
if *exp.IPRanges[0].CIDRIP != *perm.IPRanges[0].CIDRIP { if *exp.IpRanges[0].CidrIp != *perm.IpRanges[0].CidrIp {
t.Fatalf( t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n", "Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.IPRanges[0].CIDRIP, *perm.IpRanges[0].CidrIp,
*exp.IPRanges[0].CIDRIP) *exp.IpRanges[0].CidrIp)
} }
} }
@ -481,8 +481,8 @@ func TestflattenElasticacheParameters(t *testing.T) {
func TestexpandInstanceString(t *testing.T) { func TestexpandInstanceString(t *testing.T) {
expected := []*elb.Instance{ expected := []*elb.Instance{
&elb.Instance{InstanceID: aws.String("test-one")}, &elb.Instance{InstanceId: aws.String("test-one")},
&elb.Instance{InstanceID: aws.String("test-two")}, &elb.Instance{InstanceId: aws.String("test-two")},
} }
ids := []interface{}{ ids := []interface{}{
@ -498,9 +498,9 @@ func TestexpandInstanceString(t *testing.T) {
} }
func TestflattenNetworkInterfacesPrivateIPAddesses(t *testing.T) { func TestflattenNetworkInterfacesPrivateIPAddesses(t *testing.T) {
expanded := []*ec2.NetworkInterfacePrivateIPAddress{ expanded := []*ec2.NetworkInterfacePrivateIpAddress{
&ec2.NetworkInterfacePrivateIPAddress{PrivateIPAddress: aws.String("192.168.0.1")}, &ec2.NetworkInterfacePrivateIpAddress{PrivateIpAddress: aws.String("192.168.0.1")},
&ec2.NetworkInterfacePrivateIPAddress{PrivateIPAddress: aws.String("192.168.0.2")}, &ec2.NetworkInterfacePrivateIpAddress{PrivateIpAddress: aws.String("192.168.0.2")},
} }
result := flattenNetworkInterfacesPrivateIPAddesses(expanded) result := flattenNetworkInterfacesPrivateIPAddesses(expanded)
@ -524,8 +524,8 @@ func TestflattenNetworkInterfacesPrivateIPAddesses(t *testing.T) {
func TestflattenGroupIdentifiers(t *testing.T) { func TestflattenGroupIdentifiers(t *testing.T) {
expanded := []*ec2.GroupIdentifier{ expanded := []*ec2.GroupIdentifier{
&ec2.GroupIdentifier{GroupID: aws.String("sg-001")}, &ec2.GroupIdentifier{GroupId: aws.String("sg-001")},
&ec2.GroupIdentifier{GroupID: aws.String("sg-002")}, &ec2.GroupIdentifier{GroupId: aws.String("sg-002")},
} }
result := flattenGroupIdentifiers(expanded) result := flattenGroupIdentifiers(expanded)
@ -558,20 +558,20 @@ func TestexpandPrivateIPAddesses(t *testing.T) {
t.Fatalf("expected result had %d elements, but got %d", 2, len(result)) t.Fatalf("expected result had %d elements, but got %d", 2, len(result))
} }
if *result[0].PrivateIPAddress != "192.168.0.1" || !*result[0].Primary { if *result[0].PrivateIpAddress != "192.168.0.1" || !*result[0].Primary {
t.Fatalf("expected ip to be 192.168.0.1 and Primary, but got %v, %t", *result[0].PrivateIPAddress, *result[0].Primary) t.Fatalf("expected ip to be 192.168.0.1 and Primary, but got %v, %t", *result[0].PrivateIpAddress, *result[0].Primary)
} }
if *result[1].PrivateIPAddress != "192.168.0.2" || *result[1].Primary { if *result[1].PrivateIpAddress != "192.168.0.2" || *result[1].Primary {
t.Fatalf("expected ip to be 192.168.0.2 and not Primary, but got %v, %t", *result[1].PrivateIPAddress, *result[1].Primary) t.Fatalf("expected ip to be 192.168.0.2 and not Primary, but got %v, %t", *result[1].PrivateIpAddress, *result[1].Primary)
} }
} }
func TestflattenAttachment(t *testing.T) { func TestflattenAttachment(t *testing.T) {
expanded := &ec2.NetworkInterfaceAttachment{ expanded := &ec2.NetworkInterfaceAttachment{
InstanceID: aws.String("i-00001"), InstanceId: aws.String("i-00001"),
DeviceIndex: aws.Int64(int64(1)), DeviceIndex: aws.Int64(int64(1)),
AttachmentID: aws.String("at-002"), AttachmentId: aws.String("at-002"),
} }
result := flattenAttachment(expanded) result := flattenAttachment(expanded)

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

@ -24,7 +24,7 @@ func setTagsR53(conn *route53.Route53, d *schema.ResourceData, resourceType stri
} }
log.Printf("[DEBUG] Changing tags: \n\tadding: %#v\n\tremoving:%#v", create, remove) log.Printf("[DEBUG] Changing tags: \n\tadding: %#v\n\tremoving:%#v", create, remove)
req := &route53.ChangeTagsForResourceInput{ req := &route53.ChangeTagsForResourceInput{
ResourceID: aws.String(d.Id()), ResourceId: aws.String(d.Id()),
ResourceType: aws.String(resourceType), ResourceType: aws.String(resourceType),
} }