Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AWS] Adding default network ACL ID and default security group ID to VPC reference attributes #704

Merged
merged 3 commits into from
Jan 6, 2015
Merged

[AWS] Adding default network ACL ID and default security group ID to VPC reference attributes #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift click to select a range
6349845
Adding default network acl id attribute reference on creation of VPC.…
Dec 22, 2014
7860dc1
Adding default security group id attribute reference on creation of V…
Dec 23, 2014
7e4f417
Updating markdown file for VPC to reflect addition of default network…
Dec 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions builtin/providers/aws/resource_aws_vpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 47,17 @@ func resourceAwsVpc() *schema.Resource {
Computed: true,
},

"default_network_acl_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},

"default_security_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},


"tags": tagsSchema(),
},
}
Expand Down Expand Up @@ -139,6 150,9 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
d.Set("main_route_table_id", v[0].RouteTableId)
}

resourceAwsVpcSetDefaultNetworkAcl(ec2conn, d)
resourceAwsVpcSetDefaultSecurityGroup(ec2conn, d)

return nil
}

Expand Down Expand Up @@ -228,3 242,36 @@ func VPCStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return vpc, vpc.State, nil
}
}


func resourceAwsVpcSetDefaultNetworkAcl(conn *ec2.EC2, d *schema.ResourceData) error {
filter := ec2.NewFilter()
filter.Add("default", "true")
filter.Add("vpc-id", d.Id())
networkAclResp, err := conn.NetworkAcls(nil, filter)

if err != nil {
return err
}
if v := networkAclResp.NetworkAcls; len(v) > 0 {
d.Set("default_network_acl_id", v[0].NetworkAclId)
}

return nil
}

func resourceAwsVpcSetDefaultSecurityGroup(conn *ec2.EC2, d *schema.ResourceData) error {
filter := ec2.NewFilter()
filter.Add("group-name", "default")
filter.Add("vpc-id", d.Id())
securityGroupResp, err := conn.SecurityGroups(nil, filter)

if err != nil {
return err
}
if v := securityGroupResp.Groups; len(v) > 0 {
d.Set("default_security_group_id", v[0].Id)
}

return nil
}
2 changes: 2 additions & 0 deletions website/source/docs/providers/aws/r/vpc.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 54,5 @@ The following attributes are exported:
* `enable_dns_hostnames` - Whether or not the VPC has DNS hostname support
* `main_route_table_id` - The ID of the main route table associated with
this VPC.
* `default_network_acl_id` - The ID of the network ACL created by default on VPC creation
* `default_security_group_id` - The ID of the security group created by default on VPC creation