Merge pull request #1041 from aianchici/master

adding storage_encrypted as an optional parameter
This commit is contained in:
Paul Hinze 2015-03-02 11:33:52 -06:00
commit 2450b03bc6
1 changed files with 8 additions and 0 deletions

View File

@ -50,6 +50,12 @@ func resourceAwsDbInstance() *schema.Resource {
ForceNew: true, ForceNew: true,
}, },
"storage_encrypted": &schema.Schema{
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
},
"allocated_storage": &schema.Schema{ "allocated_storage": &schema.Schema{
Type: schema.TypeInt, Type: schema.TypeInt,
Required: true, Required: true,
@ -195,6 +201,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
MasterUserPassword: aws.String(d.Get("password").(string)), MasterUserPassword: aws.String(d.Get("password").(string)),
Engine: aws.String(d.Get("engine").(string)), Engine: aws.String(d.Get("engine").(string)),
EngineVersion: aws.String(d.Get("engine_version").(string)), EngineVersion: aws.String(d.Get("engine_version").(string)),
StorageEncrypted: aws.Boolean(d.Get("storage_encrypted").(bool)),
} }
if attr, ok := d.GetOk("storage_type"); ok { if attr, ok := d.GetOk("storage_type"); ok {
@ -320,6 +327,7 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error {
d.Set("address", *v.Endpoint.Port) d.Set("address", *v.Endpoint.Port)
d.Set("endpoint", fmt.Sprintf("%s:%d", *v.Endpoint.Address, *v.Endpoint.Port)) d.Set("endpoint", fmt.Sprintf("%s:%d", *v.Endpoint.Address, *v.Endpoint.Port))
d.Set("status", *v.DBInstanceStatus) d.Set("status", *v.DBInstanceStatus)
d.Set("storage_encrypted", *v.StorageEncrypted)
// Create an empty schema.Set to hold all vpc security group ids // Create an empty schema.Set to hold all vpc security group ids
ids := &schema.Set{ ids := &schema.Set{