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

provider/aws: Convert AWS VPC to upstream aws-sdk-go

This commit is contained in:
Clint Shryock 2015-04-10 16:09:12 -05:00
parent 56836c236f
commit 74bab7b89d
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@ import (
"log" "log"
"time" "time"
"github.com/hashicorp/aws-sdk-go/aws" "github.com/awslabs/aws-sdk-go/aws"
"github.com/hashicorp/aws-sdk-go/gen/ec2" "github.com/awslabs/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
) )
@ -64,18 +64,18 @@ func resourceAwsVpc() *schema.Resource {
} }
func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2SDKconn
instance_tenancy := "default" instance_tenancy := "default"
if v, ok := d.GetOk("instance_tenancy"); ok { if v, ok := d.GetOk("instance_tenancy"); ok {
instance_tenancy = v.(string) instance_tenancy = v.(string)
} }
// Create the VPC // Create the VPC
createOpts := &ec2.CreateVPCRequest{ 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 := ec2conn.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)
} }
@ -96,7 +96,7 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error {
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"pending"}, Pending: []string{"pending"},
Target: "available", Target: "available",
Refresh: VPCStateRefreshFunc(ec2conn, d.Id()), Refresh: VPCStateRefreshFunc(conn, d.Id()),
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
} }
if _, err := stateConf.WaitForState(); err != nil { if _, err := stateConf.WaitForState(); err != nil {
@ -110,10 +110,10 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error {
} }
func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2SDKconn
// Refresh the VPC state // Refresh the VPC state
vpcRaw, _, err := VPCStateRefreshFunc(ec2conn, d.Id())() vpcRaw, _, err := VPCStateRefreshFunc(conn, d.Id())()
if err != nil { if err != nil {
return err return err
} }
@ -128,25 +128,25 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
d.Set("cidr_block", vpc.CIDRBlock) d.Set("cidr_block", vpc.CIDRBlock)
// Tags // Tags
d.Set("tags", tagsToMap(vpc.Tags)) d.Set("tags", tagsToMapSDK(vpc.Tags))
// Attributes // Attributes
attribute := "enableDnsSupport" attribute := "enableDnsSupport"
DescribeAttrOpts := &ec2.DescribeVPCAttributeRequest{ DescribeAttrOpts := &ec2.DescribeVPCAttributeInput{
Attribute: aws.String(attribute), Attribute: aws.String(attribute),
VPCID: aws.String(vpcid), VPCID: aws.String(vpcid),
} }
resp, err := ec2conn.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.DescribeVPCAttributeRequest{ DescribeAttrOpts = &ec2.DescribeVPCAttributeInput{
Attribute: &attribute, Attribute: &attribute,
VPCID: &vpcid, VPCID: &vpcid,
} }
resp, err = ec2conn.DescribeVPCAttribute(DescribeAttrOpts) resp, err = conn.DescribeVPCAttribute(DescribeAttrOpts)
if err != nil { if err != nil {
return err return err
} }
@ -156,16 +156,16 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
// Really Ugly need to make this better - rmenn // Really Ugly need to make this better - rmenn
filter1 := &ec2.Filter{ filter1 := &ec2.Filter{
Name: aws.String("association.main"), Name: aws.String("association.main"),
Values: []string{("true")}, Values: []*string{aws.String("true")},
} }
filter2 := &ec2.Filter{ filter2 := &ec2.Filter{
Name: aws.String("vpc-id"), Name: aws.String("vpc-id"),
Values: []string{(d.Id())}, Values: []*string{aws.String(d.Id())},
} }
DescribeRouteOpts := &ec2.DescribeRouteTablesRequest{ DescribeRouteOpts := &ec2.DescribeRouteTablesInput{
Filters: []ec2.Filter{*filter1, *filter2}, Filters: []*ec2.Filter{filter1, filter2},
} }
routeResp, err := ec2conn.DescribeRouteTables(DescribeRouteOpts) routeResp, err := conn.DescribeRouteTables(DescribeRouteOpts)
if err != nil { if err != nil {
return err return err
} }
@ -173,21 +173,21 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
d.Set("main_route_table_id", *v[0].RouteTableID) d.Set("main_route_table_id", *v[0].RouteTableID)
} }
resourceAwsVpcSetDefaultNetworkAcl(ec2conn, d) resourceAwsVpcSetDefaultNetworkAcl(conn, d)
resourceAwsVpcSetDefaultSecurityGroup(ec2conn, d) resourceAwsVpcSetDefaultSecurityGroup(conn, d)
return nil return nil
} }
func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2SDKconn
// Turn on partial mode // Turn on partial mode
d.Partial(true) d.Partial(true)
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.ModifyVPCAttributeRequest{ modifyOpts := &ec2.ModifyVPCAttributeInput{
VPCID: &vpcid, VPCID: &vpcid,
EnableDNSHostnames: &ec2.AttributeBooleanValue{ EnableDNSHostnames: &ec2.AttributeBooleanValue{
Value: &val, Value: &val,
@ -197,7 +197,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 := ec2conn.ModifyVPCAttribute(modifyOpts); err != nil { if _, err := conn.ModifyVPCAttribute(modifyOpts); err != nil {
return err return err
} }
@ -206,7 +206,7 @@ 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.ModifyVPCAttributeRequest{ modifyOpts := &ec2.ModifyVPCAttributeInput{
VPCID: &vpcid, VPCID: &vpcid,
EnableDNSSupport: &ec2.AttributeBooleanValue{ EnableDNSSupport: &ec2.AttributeBooleanValue{
Value: &val, Value: &val,
@ -216,14 +216,14 @@ 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 := ec2conn.ModifyVPCAttribute(modifyOpts); err != nil { if _, err := conn.ModifyVPCAttribute(modifyOpts); err != nil {
return err return err
} }
d.SetPartial("enable_dns_support") d.SetPartial("enable_dns_support")
} }
if err := setTags(ec2conn, d); err != nil { if err := setTagsSDK(conn, d); err != nil {
return err return err
} else { } else {
d.SetPartial("tags") d.SetPartial("tags")
@ -234,13 +234,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 {
ec2conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2SDKconn
vpcID := d.Id() vpcID := d.Id()
DeleteVpcOpts := &ec2.DeleteVPCRequest{ DeleteVpcOpts := &ec2.DeleteVPCInput{
VPCID: &vpcID, VPCID: &vpcID,
} }
log.Printf("[INFO] Deleting VPC: %s", d.Id()) log.Printf("[INFO] Deleting VPC: %s", d.Id())
if err := ec2conn.DeleteVPC(DeleteVpcOpts); err != nil { if _, err := conn.DeleteVPC(DeleteVpcOpts); err != nil {
ec2err, ok := err.(aws.APIError) ec2err, ok := err.(aws.APIError)
if ok && ec2err.Code == "InvalidVpcID.NotFound" { if ok && ec2err.Code == "InvalidVpcID.NotFound" {
return nil return nil
@ -256,8 +256,8 @@ 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.DescribeVPCsRequest{ DescribeVpcOpts := &ec2.DescribeVPCsInput{
VPCIDs: []string{id}, VPCIDs: []*string{aws.String(id)},
} }
resp, err := conn.DescribeVPCs(DescribeVpcOpts) resp, err := conn.DescribeVPCs(DescribeVpcOpts)
if err != nil { if err != nil {
@ -275,7 +275,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
} }
} }
@ -283,14 +283,14 @@ func VPCStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
func resourceAwsVpcSetDefaultNetworkAcl(conn *ec2.EC2, d *schema.ResourceData) error { func resourceAwsVpcSetDefaultNetworkAcl(conn *ec2.EC2, d *schema.ResourceData) error {
filter1 := &ec2.Filter{ filter1 := &ec2.Filter{
Name: aws.String("default"), Name: aws.String("default"),
Values: []string{("true")}, Values: []*string{aws.String("true")},
} }
filter2 := &ec2.Filter{ filter2 := &ec2.Filter{
Name: aws.String("vpc-id"), Name: aws.String("vpc-id"),
Values: []string{(d.Id())}, Values: []*string{aws.String(d.Id())},
} }
DescribeNetworkACLOpts := &ec2.DescribeNetworkACLsRequest{ DescribeNetworkACLOpts := &ec2.DescribeNetworkACLsInput{
Filters: []ec2.Filter{*filter1, *filter2}, Filters: []*ec2.Filter{filter1, filter2},
} }
networkAclResp, err := conn.DescribeNetworkACLs(DescribeNetworkACLOpts) networkAclResp, err := conn.DescribeNetworkACLs(DescribeNetworkACLOpts)
@ -307,14 +307,14 @@ func resourceAwsVpcSetDefaultNetworkAcl(conn *ec2.EC2, d *schema.ResourceData) e
func resourceAwsVpcSetDefaultSecurityGroup(conn *ec2.EC2, d *schema.ResourceData) error { func resourceAwsVpcSetDefaultSecurityGroup(conn *ec2.EC2, d *schema.ResourceData) error {
filter1 := &ec2.Filter{ filter1 := &ec2.Filter{
Name: aws.String("group-name"), Name: aws.String("group-name"),
Values: []string{("default")}, Values: []*string{aws.String("default")},
} }
filter2 := &ec2.Filter{ filter2 := &ec2.Filter{
Name: aws.String("vpc-id"), Name: aws.String("vpc-id"),
Values: []string{(d.Id())}, Values: []*string{aws.String(d.Id())},
} }
DescribeSgOpts := &ec2.DescribeSecurityGroupsRequest{ DescribeSgOpts := &ec2.DescribeSecurityGroupsInput{
Filters: []ec2.Filter{*filter1, *filter2}, Filters: []*ec2.Filter{filter1, filter2},
} }
securityGroupResp, err := conn.DescribeSecurityGroups(DescribeSgOpts) securityGroupResp, err := conn.DescribeSecurityGroups(DescribeSgOpts)

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

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/hashicorp/aws-sdk-go/aws" "github.com/awslabs/aws-sdk-go/aws"
"github.com/hashicorp/aws-sdk-go/gen/ec2" "github.com/awslabs/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
@ -66,7 +66,7 @@ func TestAccVpc_tags(t *testing.T) {
testAccCheckVpcCidr(&vpc, "10.1.0.0/16"), testAccCheckVpcCidr(&vpc, "10.1.0.0/16"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_vpc.foo", "cidr_block", "10.1.0.0/16"), "aws_vpc.foo", "cidr_block", "10.1.0.0/16"),
testAccCheckTags(&vpc.Tags, "foo", "bar"), testAccCheckTagsSDK(&vpc.Tags, "foo", "bar"),
), ),
}, },
@ -74,8 +74,8 @@ func TestAccVpc_tags(t *testing.T) {
Config: testAccVpcConfigTagsUpdate, Config: testAccVpcConfigTagsUpdate,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckVpcExists("aws_vpc.foo", &vpc), testAccCheckVpcExists("aws_vpc.foo", &vpc),
testAccCheckTags(&vpc.Tags, "foo", ""), testAccCheckTagsSDK(&vpc.Tags, "foo", ""),
testAccCheckTags(&vpc.Tags, "bar", "baz"), testAccCheckTagsSDK(&vpc.Tags, "bar", "baz"),
), ),
}, },
}, },
@ -112,7 +112,7 @@ func TestAccVpcUpdate(t *testing.T) {
} }
func testAccCheckVpcDestroy(s *terraform.State) error { func testAccCheckVpcDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2SDKconn
for _, rs := range s.RootModule().Resources { for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_vpc" { if rs.Type != "aws_vpc" {
@ -120,8 +120,8 @@ func testAccCheckVpcDestroy(s *terraform.State) error {
} }
// Try to find the VPC // Try to find the VPC
DescribeVpcOpts := &ec2.DescribeVPCsRequest{ DescribeVpcOpts := &ec2.DescribeVPCsInput{
VPCIDs: []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 {
@ -167,9 +167,9 @@ func testAccCheckVpcExists(n string, vpc *ec2.VPC) resource.TestCheckFunc {
return fmt.Errorf("No VPC ID is set") return fmt.Errorf("No VPC ID is set")
} }
conn := testAccProvider.Meta().(*AWSClient).ec2conn conn := testAccProvider.Meta().(*AWSClient).ec2SDKconn
DescribeVpcOpts := &ec2.DescribeVPCsRequest{ DescribeVpcOpts := &ec2.DescribeVPCsInput{
VPCIDs: []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 {
@ -179,7 +179,7 @@ func testAccCheckVpcExists(n string, vpc *ec2.VPC) resource.TestCheckFunc {
return fmt.Errorf("VPC not found") return fmt.Errorf("VPC not found")
} }
*vpc = resp.VPCs[0] *vpc = *resp.VPCs[0]
return nil return nil
} }