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

Changes after the feedback from @catsby - these all made perfect sense

This commit is contained in:
stack72 2015-11-05 10:25:01 +00:00
parent 4e485d4254
commit 409df4866d
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/providers/aws/resource_aws_rds_cluster.go
View File

@ -127,12 +127,17 @@ func resourceAwsRDSCluster() *schema.Resource {
"preferred_backup_window": &schema.Schema{ "preferred_backup_window": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true,
}, },
"preferred_maintenance_window": &schema.Schema{ "preferred_maintenance_window": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true,
StateFunc: func(val interface{}) string { StateFunc: func(val interface{}) string {
if val == nil {
return ""
}
return strings.ToLower(val.(string)) return strings.ToLower(val.(string))
}, },
}, },

40
builtin/providers/aws/resource_aws_rds_cluster_test.go
View File

@ -20,6 +20,27 @@ func TestAccAWSRDSCluster_basic(t *testing.T) {
ri := rand.New(rand.NewSource(time.Now().UnixNano())).Int() ri := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
config := fmt.Sprintf(testAccAWSClusterConfig, ri) config := fmt.Sprintf(testAccAWSClusterConfig, ri)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSClusterDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSClusterExists("aws_rds_cluster.default", &v),
),
},
},
})
}
func TestAccAWSRDSCluster_backups(t *testing.T) {
var v rds.DBCluster
ri := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
config := fmt.Sprintf(testAccAWSClusterConfig_backups, ri)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
@ -41,12 +62,12 @@ func TestAccAWSRDSCluster_basic(t *testing.T) {
}) })
} }
func TestAccAWSRDSCluster_update(t *testing.T) { func TestAccAWSRDSCluster_backupsUpdate(t *testing.T) {
var v rds.DBCluster var v rds.DBCluster
ri := rand.New(rand.NewSource(time.Now().UnixNano())).Int() ri := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
preConfig := fmt.Sprintf(testAccAWSClusterConfig, ri) preConfig := fmt.Sprintf(testAccAWSClusterConfig_backups, ri)
postConfig := fmt.Sprintf(testAccAWSClusterConfig_update, ri) postConfig := fmt.Sprintf(testAccAWSClusterConfig_backupsUpdate, ri)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -147,8 +168,16 @@ func testAccCheckAWSClusterExists(n string, v *rds.DBCluster) resource.TestCheck
} }
} }
// Add some random to the name, to avoid collision
var testAccAWSClusterConfig = ` var testAccAWSClusterConfig = `
resource "aws_rds_cluster" "default" {
cluster_identifier = "tf-aurora-cluster-%d"
availability_zones = ["us-west-2a","us-west-2b","us-west-2c"]
database_name = "mydb"
master_username = "foo"
master_password = "mustbeeightcharaters"
}`
var testAccAWSClusterConfig_backups = `
resource "aws_rds_cluster" "default" { resource "aws_rds_cluster" "default" {
cluster_identifier = "tf-aurora-cluster-%d" cluster_identifier = "tf-aurora-cluster-%d"
availability_zones = ["us-west-2a","us-west-2b","us-west-2c"] availability_zones = ["us-west-2a","us-west-2b","us-west-2c"]
@ -160,8 +189,7 @@ resource "aws_rds_cluster" "default" {
preferred_maintenance_window = "tue:04:00-tue:04:30" preferred_maintenance_window = "tue:04:00-tue:04:30"
}` }`
// Add some random to the name, to avoid collision var testAccAWSClusterConfig_backupsUpdate = `
var testAccAWSClusterConfig_update = `
resource "aws_rds_cluster" "default" { resource "aws_rds_cluster" "default" {
cluster_identifier = "tf-aurora-cluster-%d" cluster_identifier = "tf-aurora-cluster-%d"
availability_zones = ["us-west-2a","us-west-2b","us-west-2c"] availability_zones = ["us-west-2a","us-west-2b","us-west-2c"]