-
Notifications
You must be signed in to change notification settings - Fork 9.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #295 from buth/awsdbsubnets
AWS DB Subnet Group resource and testing
- Loading branch information
Showing
4 changed files
with
258 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
package aws | ||
|
||
import ( | ||
"fmt" | ||
"log" | ||
"time" | ||
|
||
"github.com/hashicorp/terraform/helper/hashcode" | ||
"github.com/hashicorp/terraform/helper/resource" | ||
"github.com/hashicorp/terraform/helper/schema" | ||
"github.com/mitchellh/goamz/rds" | ||
) | ||
|
||
func resourceAwsDbSubnetGroup() *schema.Resource { | ||
return &schema.Resource{ | ||
Create: resourceAwsDbSubnetGroupCreate, | ||
Read: resourceAwsDbSubnetGroupRead, | ||
Update: nil, | ||
Delete: resourceAwsDbSubnetGroupDelete, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
"name": &schema.Schema{ | ||
Type: schema.TypeString, | ||
ForceNew: true, | ||
Required: true, | ||
}, | ||
|
||
"description": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
|
||
"subnet_ids": &schema.Schema{ | ||
Type: schema.TypeSet, | ||
Required: true, | ||
ForceNew: true, | ||
Elem: &schema.Schema{Type: schema.TypeString}, | ||
Set: func(v interface{}) int { | ||
return hashcode.String(v.(string)) | ||
}, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func resourceAwsDbSubnetGroupCreate(d *schema.ResourceData, meta interface{}) error { | ||
p := meta.(*ResourceProvider) | ||
rdsconn := p.rdsconn | ||
|
||
subnetIdsSet := d.Get("subnet_ids").(*schema.Set) | ||
subnetIds := make([]string, subnetIdsSet.Len()) | ||
for i, subnetId := range subnetIdsSet.List() { | ||
subnetIds[i] = subnetId.(string) | ||
} | ||
|
||
createOpts := rds.CreateDBSubnetGroup{ | ||
DBSubnetGroupName: d.Get("name").(string), | ||
DBSubnetGroupDescription: d.Get("description").(string), | ||
SubnetIds: subnetIds, | ||
} | ||
|
||
log.Printf("[DEBUG] Create DB Subnet Group: %#v", createOpts) | ||
_, err := rdsconn.CreateDBSubnetGroup(&createOpts) | ||
if err != nil { | ||
return fmt.Errorf("Error creating DB Subnet Group: %s", err) | ||
} | ||
|
||
d.SetId(createOpts.DBSubnetGroupName) | ||
log.Printf("[INFO] DB Subnet Group ID: %s", d.Id()) | ||
return resourceAwsDbSubnetGroupRead(d, meta) | ||
} | ||
|
||
func resourceAwsDbSubnetGroupDelete(d *schema.ResourceData, meta interface{}) error { | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{"pending"}, | ||
Target: "destroyed", | ||
Refresh: resourceDbSubnetGroupDeleteRefreshFunc(d, meta), | ||
Timeout: 3 * time.Minute, | ||
MinTimeout: 1 * time.Second, | ||
} | ||
_, err := stateConf.WaitForState() | ||
return err | ||
} | ||
|
||
func resourceAwsDbSubnetGroupRead(d *schema.ResourceData, meta interface{}) error { | ||
p := meta.(*ResourceProvider) | ||
rdsconn := p.rdsconn | ||
|
||
describeOpts := rds.DescribeDBSubnetGroups{ | ||
DBSubnetGroupName: d.Id(), | ||
} | ||
|
||
describeResp, err := rdsconn.DescribeDBSubnetGroups(&describeOpts) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
if len(describeResp.DBSubnetGroups) != 1 || | ||
describeResp.DBSubnetGroups[0].Name != d.Id() { | ||
} | ||
|
||
d.Set("name", describeResp.DBSubnetGroups[0].Name) | ||
d.Set("description", describeResp.DBSubnetGroups[0].Description) | ||
d.Set("subnet_ids", describeResp.DBSubnetGroups[0].SubnetIds) | ||
|
||
return nil | ||
} | ||
|
||
func resourceDbSubnetGroupDeleteRefreshFunc( | ||
d *schema.ResourceData, | ||
meta interface{}) resource.StateRefreshFunc { | ||
p := meta.(*ResourceProvider) | ||
rdsconn := p.rdsconn | ||
|
||
return func() (interface{}, string, error) { | ||
|
||
deleteOpts := rds.DeleteDBSubnetGroup{ | ||
DBSubnetGroupName: d.Id(), | ||
} | ||
|
||
if _, err := rdsconn.DeleteDBSubnetGroup(&deleteOpts); err != nil { | ||
rdserr, ok := err.(*rds.Error) | ||
if !ok { | ||
return d, "error", err | ||
} | ||
|
||
if rdserr.Code != "DBSubnetGroupNotFoundFault" { | ||
return d, "error", err | ||
} | ||
} | ||
|
||
return d, "destroyed", nil | ||
} | ||
} |
112 changes: 112 additions & 0 deletions
112
builtin/providers/aws/resource_aws_db_subnet_group_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
package aws | ||
|
||
import ( | ||
"fmt" | ||
"testing" | ||
|
||
"github.com/hashicorp/terraform/helper/resource" | ||
"github.com/hashicorp/terraform/terraform" | ||
"github.com/mitchellh/goamz/rds" | ||
) | ||
|
||
func TestAccAWSDbSubnetGroup(t *testing.T) { | ||
var v rds.DBSubnetGroup | ||
|
||
testCheck := func(*terraform.State) error { | ||
return nil | ||
} | ||
|
||
resource.Test(t, resource.TestCase{ | ||
PreCheck: func() { testAccPreCheck(t) }, | ||
Providers: testAccProviders, | ||
CheckDestroy: testAccCheckDbSubnetGroupDestroy, | ||
Steps: []resource.TestStep{ | ||
resource.TestStep{ | ||
Config: testAccDbSubnetGroupConfig, | ||
Check: resource.ComposeTestCheckFunc( | ||
testAccCheckDbSubnetGroupExists( | ||
"aws_db_subnet_group.foo", &v), | ||
testCheck, | ||
), | ||
}, | ||
}, | ||
}) | ||
} | ||
|
||
func testAccCheckDbSubnetGroupDestroy(s *terraform.State) error { | ||
conn := testAccProvider.rdsconn | ||
|
||
for _, rs := range s.Resources { | ||
if rs.Type != "aws_db_subnet_group" { | ||
continue | ||
} | ||
|
||
// Try to find the resource | ||
resp, err := conn.DescribeDBSubnetGroups(&rds.DescribeDBSubnetGroups{rs.ID}) | ||
if err == nil { | ||
if len(resp.DBSubnetGroups) > 0 { | ||
return fmt.Errorf("still exist.") | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// Verify the error is what we want | ||
rdserr, ok := err.(*rds.Error) | ||
if !ok { | ||
return err | ||
} | ||
if rdserr.Code != "DBSubnetGroupNotFoundFault" { | ||
return err | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func testAccCheckDbSubnetGroupExists(n string, v *rds.DBSubnetGroup) resource.TestCheckFunc { | ||
return func(s *terraform.State) error { | ||
rs, ok := s.Resources[n] | ||
if !ok { | ||
return fmt.Errorf("Not found: %s", n) | ||
} | ||
|
||
if rs.ID == "" { | ||
return fmt.Errorf("No ID is set") | ||
} | ||
|
||
conn := testAccProvider.rdsconn | ||
resp, err := conn.DescribeDBSubnetGroups(&rds.DescribeDBSubnetGroups{rs.ID}) | ||
if err != nil { | ||
return err | ||
} | ||
if len(resp.DBSubnetGroups) == 0 { | ||
return fmt.Errorf("DbSubnetGroup not found") | ||
} | ||
|
||
*v = resp.DBSubnetGroups[0] | ||
|
||
return nil | ||
} | ||
} | ||
|
||
const testAccDbSubnetGroupConfig = ` | ||
resource "aws_vpc" "foo" { | ||
cidr_block = "10.1.0.0/16" | ||
} | ||
resource "aws_subnet" "foo" { | ||
cidr_block = "10.1.1.0/24" | ||
vpc_id = "${aws_vpc.foo.id}" | ||
} | ||
resource "aws_subnet" "bar" { | ||
cidr_block = "10.1.2.0/24" | ||
vpc_id = "${aws_vpc.foo.id}" | ||
} | ||
resource "aws_db_subnet_group" "foo" { | ||
name = "foo" | ||
subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] | ||
} | ||
` |