From 652fa702cf6f8024159c4e0294638dd1e4c23ce7 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 20 Jul 2021 17:11:30 -0400 Subject: [PATCH 1/4] i/servicecat: Increase provisioned product TO --- aws/internal/service/servicecatalog/waiter/waiter.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aws/internal/service/servicecatalog/waiter/waiter.go b/aws/internal/service/servicecatalog/waiter/waiter.go index 0e878168594..695d2bd48c7 100644 --- a/aws/internal/service/servicecatalog/waiter/waiter.go +++ b/aws/internal/service/servicecatalog/waiter/waiter.go @@ -43,8 +43,9 @@ 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 From 9bfa9a5e064400d7b1f30c5492fdf3971d175621 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 20 Jul 2021 17:12:03 -0400 Subject: [PATCH 2/4] r/servicecat_provisioned_product: Increase timeouts --- aws/resource_aws_servicecatalog_provisioned_product.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aws/resource_aws_servicecatalog_provisioned_product.go b/aws/resource_aws_servicecatalog_provisioned_product.go index b43ea4b4636..122ec920fcb 100644 --- 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, From 279fe35a304bf380ca9cd04adf461ce197df5c32 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 20 Jul 2021 17:15:03 -0400 Subject: [PATCH 3/4] r/servicecat_provisioned_product: Changelog --- .changelog/20254.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/20254.txt diff --git a/.changelog/20254.txt b/.changelog/20254.txt new file mode 100644 index 00000000000..dfa9935d1ef --- /dev/null +++ b/.changelog/20254.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_servicecatalog_provisioned_product: Increase timeouts to align with CloudFormation (30 min.) +``` \ No newline at end of file From 02fe623c63306d5df0075f93561f2005b69e8415 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 20 Jul 2021 17:17:51 -0400 Subject: [PATCH 4/4] r/servicecat_prov_prod: Increase recordready timeout --- aws/internal/service/servicecatalog/waiter/waiter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/internal/service/servicecatalog/waiter/waiter.go b/aws/internal/service/servicecatalog/waiter/waiter.go index 695d2bd48c7..e91282a1532 100644 --- a/aws/internal/service/servicecatalog/waiter/waiter.go +++ b/aws/internal/service/servicecatalog/waiter/waiter.go @@ -47,7 +47,7 @@ const ( ProvisionedProductUpdateTimeout = 30 * time.Minute ProvisionedProductDeleteTimeout = 30 * time.Minute - RecordReadyTimeout = 3 * time.Minute + RecordReadyTimeout = 30 * time.Minute PortfolioConstraintsReadyTimeout = 3 * time.Minute