Merge pull request GoogleCloudPlatform#55 from modular-magician/codeg…

…en-pr-636 Update composer timeouts
modular-magician · Oct 29, 2018 · 886fa0e · 886fa0e
2 parents c529f17 + 83630f9
commit 886fa0e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/google-beta/resource_composer_environment.go b/google-beta/resource_composer_environment.go
@@ -46,9 +46,9 @@ func resourceComposerEnvironment() *schema.Resource {
 
 		Timeouts: &schema.ResourceTimeout{
 			// Composer takes <= 1 hr for create/update.
-			Create: schema.DefaultTimeout(3600 * time.Second),
-			Update: schema.DefaultTimeout(3600 * time.Second),
-			Delete: schema.DefaultTimeout(360 * time.Second),
+			Create: schema.DefaultTimeout(60 * time.Minute),
+			Update: schema.DefaultTimeout(60 * time.Minute),
+			Delete: schema.DefaultTimeout(15 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{