Merge pull request #20254 from hashicorp/f-servicecat-provisioned-to

r/servicecat_provisioned_product: Increase timeouts
hashicorp · Jul 21, 2021 · f1e9e00 · f1e9e00
2 parents 5dd35c6 + 02fe623
commit f1e9e00
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.changelog/20254.txt b/.changelog/20254.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_servicecatalog_provisioned_product: Increase timeouts to align with CloudFormation (30 min.)
+```
diff --git a/aws/internal/service/servicecatalog/waiter/waiter.go b/aws/internal/service/servicecatalog/waiter/waiter.go
@@ -43,10 +43,11 @@ const (
 
 	LaunchPathsReadyTimeout = 3 * time.Minute
 
-	ProvisionedProductReadyTimeout  = 3 * time.Minute
-	ProvisionedProductDeleteTimeout = 3 * time.Minute
+	ProvisionedProductReadyTimeout  = 30 * time.Minute
+	ProvisionedProductUpdateTimeout = 30 * time.Minute
+	ProvisionedProductDeleteTimeout = 30 * time.Minute
 
-	RecordReadyTimeout = 3 * time.Minute
+	RecordReadyTimeout = 30 * time.Minute
 
 	PortfolioConstraintsReadyTimeout = 3 * time.Minute
 

diff --git a/aws/resource_aws_servicecatalog_provisioned_product.go b/aws/resource_aws_servicecatalog_provisioned_product.go
@@ -28,6 +28,12 @@ func resourceAwsServiceCatalogProvisionedProduct() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(waiter.ProvisionedProductReadyTimeout),
+			Update: schema.DefaultTimeout(waiter.ProvisionedProductUpdateTimeout),
+			Delete: schema.DefaultTimeout(waiter.ProvisionedProductDeleteTimeout),
+		},
+
 		Schema: map[string]*schema.Schema{
 			"accept_language": {
 				Type:         schema.TypeString,