From f0957066d93a6ba7f42816691e56e63667960f21 Mon Sep 17 00:00:00 2001 From: emily Date: Wed, 18 Dec 2019 21:07:20 +0000 Subject: [PATCH] Bump Composer timeouts Signed-off-by: Modular Magician --- google-beta/resource_composer_environment.go | 6 +++--- google-beta/resource_sql_database_instance_test.go | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/google-beta/resource_composer_environment.go b/google-beta/resource_composer_environment.go index a38d7d1d93..eddd511e5a 100644 --- a/google-beta/resource_composer_environment.go +++ b/google-beta/resource_composer_environment.go @@ -65,9 +65,9 @@ func resourceComposerEnvironment() *schema.Resource { Timeouts: &schema.ResourceTimeout{ // Composer takes <= 1 hr for create/update. - Create: schema.DefaultTimeout(60 * time.Minute), - Update: schema.DefaultTimeout(60 * time.Minute), - Delete: schema.DefaultTimeout(15 * time.Minute), + Create: schema.DefaultTimeout(120 * time.Minute), + Update: schema.DefaultTimeout(120 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), }, Schema: map[string]*schema.Schema{ diff --git a/google-beta/resource_sql_database_instance_test.go b/google-beta/resource_sql_database_instance_test.go index 37f554d23a..a2d60ce2bd 100644 --- a/google-beta/resource_sql_database_instance_test.go +++ b/google-beta/resource_sql_database_instance_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - sqladmin "google.golang.org/api/sqladmin/v1beta4" )