Merge branch 'master' of https://github.com/freeman/terraform into freeman-master
This commit is contained in:
commit
58412762eb
|
@ -236,6 +236,11 @@ func resourceAwsDbInstance() *schema.Resource {
|
|||
Computed: true,
|
||||
},
|
||||
|
||||
"zone_id": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
|
||||
"status": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
|
@ -669,7 +674,7 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error {
|
|||
if v.Endpoint != nil {
|
||||
d.Set("port", v.Endpoint.Port)
|
||||
d.Set("address", v.Endpoint.Address)
|
||||
|
||||
d.Set("zone_id", v.Endpoint.HostedZoneId)
|
||||
if v.Endpoint.Address != nil && v.Endpoint.Port != nil {
|
||||
d.Set("endpoint",
|
||||
fmt.Sprintf("%s:%d", *v.Endpoint.Address, *v.Endpoint.Port))
|
||||
|
|
|
@ -136,6 +136,7 @@ The following attributes are exported:
|
|||
* `status` - The RDS instance status
|
||||
* `username` - The master username for the database
|
||||
* `storage_encrypted` - Specifies whether the DB instance is encrypted
|
||||
* `zone_id` - The canonical hosted zone ID of the DB instance (to be used in a Route 53 Alias record)
|
||||
|
||||
On Oracle instances the following is exported additionally:
|
||||
|
||||
|
|
Loading…
Reference in New Issue