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

Merge branch 'master' of https://github.com/statoilfuelretail/terraform into statoilfuelretail-master

This commit is contained in:
stack72 2016-06-02 18:06:37 +01:00
parent fcb952dcc8 9e3cef3ce5
commit b3d680eee0
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/providers/aws/resource_aws_db_instance.go
View File

@ -66,6 +66,13 @@ func resourceAwsDbInstance() *schema.Resource {
Computed: true, Computed: true,
}, },
"character_set_name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
},
"storage_encrypted": &schema.Schema{ "storage_encrypted": &schema.Schema{
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
@ -504,6 +511,10 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
} }
if attr, ok := d.GetOk("character_set_name"); ok {
opts.CharacterSetName = aws.String(attr.(string))
}
if attr, ok := d.GetOk("maintenance_window"); ok { if attr, ok := d.GetOk("maintenance_window"); ok {
opts.PreferredMaintenanceWindow = aws.String(attr.(string)) opts.PreferredMaintenanceWindow = aws.String(attr.(string))
} }
@ -651,6 +662,10 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error {
d.Set("db_subnet_group_name", v.DBSubnetGroup.DBSubnetGroupName) d.Set("db_subnet_group_name", v.DBSubnetGroup.DBSubnetGroupName)
} }
if v.CharacterSetName != nil {
d.Set("character_set_name", v.CharacterSetName)
}
if len(v.DBParameterGroups) > 0 { if len(v.DBParameterGroups) > 0 {
d.Set("parameter_group_name", v.DBParameterGroups[0].DBParameterGroupName) d.Set("parameter_group_name", v.DBParameterGroups[0].DBParameterGroupName)
} }

6
website/source/docs/providers/aws/r/db_instance.html.markdown
View File

@ -103,6 +103,8 @@ enhanced monitoring metrics to CloudWatch Logs. You can find more information on
what IAM permissions are needed to allow Enhanced Monitoring for RDS Instances. what IAM permissions are needed to allow Enhanced Monitoring for RDS Instances.
* `monitoring_interval` - (Optional) The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the DB instance. To disable collecting Enhanced Monitoring metrics, specify 0. The default is 0. Valid Values: 0, 1, 5, 10, 15, 30, 60. * `monitoring_interval` - (Optional) The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the DB instance. To disable collecting Enhanced Monitoring metrics, specify 0. The default is 0. Valid Values: 0, 1, 5, 10, 15, 30, 60.
* `kms_key_id` - (Optional) The ARN for the KMS encryption key. * `kms_key_id` - (Optional) The ARN for the KMS encryption key.
* `character_set_name` - (Optional) The character set name to use for DB encoding in Oracle instances. This can't be changed.
[Oracle Character Sets Supported in Amazon RDS](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Appendix.OracleCharacterSets.html)
* `tags` - (Optional) A mapping of tags to assign to the resource. * `tags` - (Optional) A mapping of tags to assign to the resource.
~> **NOTE:** Removing the `replicate_source_db` attribute from an existing RDS ~> **NOTE:** Removing the `replicate_source_db` attribute from an existing RDS
@ -132,5 +134,9 @@ The following attributes are exported:
* `username` - The master username for the database * `username` - The master username for the database
* `storage_encrypted` - Specifies whether the DB instance is encrypted * `storage_encrypted` - Specifies whether the DB instance is encrypted
On Oracle instances the following is exported additionally:
* `character_set_name` - The character set used on Oracle instances.
[1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html
[2]: https://docs.aws.amazon.com/fr_fr/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html [2]: https://docs.aws.amazon.com/fr_fr/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html