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

Merge pull request #1712 from hashicorp/f-rename-elasticache-cluster 

providers/aws: add _cluster to aws_elasticache
This commit is contained in:
Paul Hinze 2015-05-01 20:07:19 -05:00
parent df15757311 15b9bde1fe
commit fb37b3515d
3 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ func Provider() terraform.ResourceProvider {
"aws_db_security_group": resourceAwsDbSecurityGroup(), "aws_db_security_group": resourceAwsDbSecurityGroup(),
"aws_db_subnet_group": resourceAwsDbSubnetGroup(), "aws_db_subnet_group": resourceAwsDbSubnetGroup(),
"aws_ebs_volume": resourceAwsEbsVolume(), "aws_ebs_volume": resourceAwsEbsVolume(),
"aws_elasticache": resourceAwsElasticache(), "aws_elasticache_cluster": resourceAwsElasticacheCluster(),
"aws_elasticache_subnet_group": resourceAwsElasticacheSubnetGroup(), "aws_elasticache_subnet_group": resourceAwsElasticacheSubnetGroup(),
"aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(), "aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(),
"aws_eip": resourceAwsEip(), "aws_eip": resourceAwsEip(),

14
builtin/providers/aws/resource_aws_elasticache.go → builtin/providers/aws/resource_aws_elasticache_cluster.go
View File

@ -12,11 +12,11 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
) )
func resourceAwsElasticache() *schema.Resource { func resourceAwsElasticacheCluster() *schema.Resource {
return &schema.Resource{ return &schema.Resource{
Create: resourceAwsElasticacheCreate, Create: resourceAwsElasticacheClusterCreate,
Read: resourceAwsElasticacheRead, Read: resourceAwsElasticacheClusterRead,
Delete: resourceAwsElasticacheDelete, Delete: resourceAwsElasticacheClusterDelete,
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"cluster_id": &schema.Schema{ "cluster_id": &schema.Schema{
@ -84,7 +84,7 @@ func resourceAwsElasticache() *schema.Resource {
} }
} }
func resourceAwsElasticacheCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).elasticacheconn conn := meta.(*AWSClient).elasticacheconn
clusterId := d.Get("cluster_id").(string) clusterId := d.Get("cluster_id").(string)
@ -140,7 +140,7 @@ func resourceAwsElasticacheCreate(d *schema.ResourceData, meta interface{}) erro
return nil return nil
} }
func resourceAwsElasticacheRead(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()),
@ -170,7 +170,7 @@ func resourceAwsElasticacheRead(d *schema.ResourceData, meta interface{}) error
return nil return nil
} }
func resourceAwsElasticacheDelete(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{

46
builtin/providers/aws/resource_aws_elasticache_test.go → builtin/providers/aws/resource_aws_elasticache_cluster_test.go
View File

@ -12,35 +12,45 @@ import (
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccAWSElasticache(t *testing.T) { func TestAccAWSElasticacheCluster(t *testing.T) {
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: testAccCheckAWSElasticacheDestroy, CheckDestroy: testAccCheckAWSElasticacheClusterDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccAWSElasticacheConfig, Config: testAccAWSElasticacheClusterConfig,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcacheSecurityGroupExists("aws_elasticache_security_group.bar"), testAccCheckAWSEcacheSecurityGroupExists("aws_elasticache_security_group.bar"),
testAccCheckAWSElasticacheExists("aws_elasticache.bar"), testAccCheckAWSElasticacheClusterExists("aws_elasticache_cluster.bar"),
),
},
resource.TestStep{
Config: testAccAWSElasticacheInVPCConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcacheSubnetGroupExists("aws_elasticache_subnet_group.bar"),
testAccCheckAWSElasticacheExists("aws_elasticache.bar"),
), ),
}, },
}, },
}) })
} }
func testAccCheckAWSElasticacheDestroy(s *terraform.State) error { func TestAccAWSElasticacheCluster_vpc(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSElasticacheClusterDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSElasticacheClusterInVPCConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcacheSubnetGroupExists("aws_elasticache_subnet_group.bar"),
testAccCheckAWSElasticacheClusterExists("aws_elasticache_cluster.bar"),
),
},
},
})
}
func testAccCheckAWSElasticacheClusterDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).elasticacheconn conn := testAccProvider.Meta().(*AWSClient).elasticacheconn
for _, rs := range s.RootModule().Resources { for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_elasticache" { if rs.Type != "aws_elasticache_cluster" {
continue continue
} }
res, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{ res, err := conn.DescribeCacheClusters(&elasticache.DescribeCacheClustersInput{
@ -56,7 +66,7 @@ func testAccCheckAWSElasticacheDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckAWSElasticacheExists(n string) resource.TestCheckFunc { func testAccCheckAWSElasticacheClusterExists(n string) 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 {
@ -82,7 +92,7 @@ func genRandInt() int {
return rand.New(rand.NewSource(time.Now().UnixNano())).Int() % 1000 return rand.New(rand.NewSource(time.Now().UnixNano())).Int() % 1000
} }
var testAccAWSElasticacheConfig = fmt.Sprintf(` var testAccAWSElasticacheClusterConfig = fmt.Sprintf(`
resource "aws_security_group" "bar" { resource "aws_security_group" "bar" {
name = "tf-test-security-group-%03d" name = "tf-test-security-group-%03d"
description = "tf-test-security-group-descr" description = "tf-test-security-group-descr"
@ -100,7 +110,7 @@ resource "aws_elasticache_security_group" "bar" {
security_group_names = ["${aws_security_group.bar.name}"] security_group_names = ["${aws_security_group.bar.name}"]
} }
resource "aws_elasticache" "bar" { resource "aws_elasticache_cluster" "bar" {
cluster_id = "tf-test-%03d" cluster_id = "tf-test-%03d"
engine = "memcached" engine = "memcached"
node_type = "cache.m1.small" node_type = "cache.m1.small"
@ -110,7 +120,7 @@ resource "aws_elasticache" "bar" {
} }
`, genRandInt(), genRandInt(), genRandInt()) `, genRandInt(), genRandInt(), genRandInt())
var testAccAWSElasticacheInVPCConfig = fmt.Sprintf(` var testAccAWSElasticacheClusterInVPCConfig = fmt.Sprintf(`
resource "aws_vpc" "foo" { resource "aws_vpc" "foo" {
cidr_block = "192.168.0.0/16" cidr_block = "192.168.0.0/16"
tags { tags {
@ -145,7 +155,7 @@ resource "aws_security_group" "bar" {
} }
} }
resource "aws_elasticache" "bar" { resource "aws_elasticache_cluster" "bar" {
cluster_id = "tf-test-%03d" cluster_id = "tf-test-%03d"
node_type = "cache.m1.small" node_type = "cache.m1.small"
num_cache_nodes = 1 num_cache_nodes = 1