Export connection_name on sql instance resource (#406)

This commit is contained in:
Joe Selman 2017-09-12 08:04:13 -07:00 committed by GitHub
parent 36d8e3f403
commit 7dea4e86c1
3 changed files with 14 additions and 0 deletions

View File

@ -215,6 +215,11 @@ func resourceSqlDatabaseInstance() *schema.Resource {
},
},
"connection_name": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},
"database_version": &schema.Schema{
Type: schema.TypeString,
Optional: true,
@ -659,6 +664,7 @@ func resourceSqlDatabaseInstanceRead(d *schema.ResourceData, meta interface{}) e
d.Set("name", instance.Name)
d.Set("region", instance.Region)
d.Set("database_version", instance.DatabaseVersion)
d.Set("connection_name", instance.ConnectionName)
if err := d.Set("settings", flattenSettings(instance.Settings)); err != nil {
log.Printf("[WARN] Failed to set SQL Database Instance Settings")

View File

@ -604,6 +604,12 @@ func testAccCheckGoogleSqlDatabaseInstanceEquals(n string,
}
}
server = instance.ConnectionName
local = attributes["connection_name"]
if server != local {
return fmt.Errorf("Error connection_name mismatch. (%s, %s)", server, local)
}
return nil
}
}

View File

@ -44,6 +44,8 @@ The following arguments are supported:
- - -
* `connection_name` - (Optional) The connection name of the instance to be used in connection strings.
* `database_version` - (Optional, Default: `MYSQL_5_6`) The MySQL version to
use. Can be `MYSQL_5_6`, `MYSQL_5_7` or `POSTGRES_9_6` for second-generation
instances, or `MYSQL_5_5` or `MYSQL_5_6` for first-generation instances.