From 781725348e4d064bc3a7add212db41ed26198f24 Mon Sep 17 00:00:00 2001 From: Dan Wendorf Date: Fri, 28 Oct 2016 05:41:03 -0700 Subject: [PATCH] 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. --- builtin/providers/google/sqladmin_operation.go | 2 +- .../providers/google/r/sql_database_instance.html.markdown | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/providers/google/sqladmin_operation.go b/builtin/providers/google/sqladmin_operation.go index 05a2931bde..c096bab2b8 100644 --- a/builtin/providers/google/sqladmin_operation.go +++ b/builtin/providers/google/sqladmin_operation.go @@ -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 { diff --git a/website/source/docs/providers/google/r/sql_database_instance.html.markdown b/website/source/docs/providers/google/r/sql_database_instance.html.markdown index 7eab5f1fbf..3d235163ac 100644 --- a/website/source/docs/providers/google/r/sql_database_instance.html.markdown +++ b/website/source/docs/providers/google/r/sql_database_instance.html.markdown @@ -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