provider/google Support MySQL 5.7 instances (#9673)

* provider/google Document MySQL versions for second generation instances

Google Cloud SQL has first-gen and second-gen instances with different
supported versions of MySQL.

* provider/google Increase SQL Admin operation timeout to 10 minutes

Creating SQL instances for MySQL 5.7 can take over 7 minutes,
so the timeout needs to be increased to allow the
google_sql_database_instance resource to successfully create.
This commit is contained in:
Dan Wendorf 2016-10-28 05:41:03 -07:00 committed by Paul Stack
parent 46cb7b4710
commit 781725348e
2 changed files with 5 additions and 2 deletions

View File

@ -64,7 +64,7 @@ func sqladminOperationWait(config *Config, op *sqladmin.Operation, activity stri
}
state := w.Conf()
state.Timeout = 5 * time.Minute
state.Timeout = 10 * time.Minute
state.MinTimeout = 2 * time.Second
opRaw, err := state.WaitForState()
if err != nil {

View File

@ -38,7 +38,10 @@ The following arguments are supported:
- - -
* `database_version` - (Optional, Default: `MYSQL_5_6`) The MySQL version to
use. Can be either `MYSQL_5_5` or `MYSQL_5_6`.
use. Can be either `MYSQL_5_6` or `MYSQL_5_7` for second-generation
instances, or `MYSQL_5_5` or `MYSQL_5_6` for first-generation instances.
See Google's [Second Generation Capabilities](https://cloud.google.com/sql/docs/1st-2nd-gen-differences)
for more information.
* `name` - (Optional, Computed) The name of the instance. If the name is left
blank, Terraform will randomly generate one when the instance is first