Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/servicecat_provisioned_product: Increase timeouts #20254

Merged
merged 4 commits into from
Jul 21, 2021
Merged

r/servicecat_provisioned_product: Increase timeouts #20254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
652fa70
i/servicecat: Increase provisioned product TO
YakDriver Jul 20, 2021
9bfa9a5
r/servicecat_provisioned_product: Increase timeouts
YakDriver Jul 20, 2021
279fe35
r/servicecat_provisioned_product: Changelog
YakDriver Jul 20, 2021
02fe623
r/servicecat_prov_prod: Increase recordready timeout
YakDriver Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/20254.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_servicecatalog_provisioned_product: Increase timeouts to align with CloudFormation (30 min.)
```
7 changes: 4 additions & 3 deletions aws/internal/service/servicecatalog/waiter/waiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions aws/resource_aws_servicecatalog_provisioned_product.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down