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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ssoadmin: Configurable timeouts #33121

Merged
merged 20 commits into from
Aug 21, 2023
Merged

ssoadmin: Configurable timeouts #33121

merged 20 commits into from
Aug 21, 2023

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Aug 21, 2023 •
edited

Description

Add configurable timeouts to various IAM Identity Center (ssoadmin) resources.
Also improves error messages.

Relations

Closes #23585.
Closes #26807.
Closes #31456.
Closes #30745.
Closes #26138.
Closes #26763.

Output from Acceptance Testing

% AWS_IDENTITY_STORE_GROUP_NAME=testgroup1 AWS_IDENTITY_STORE_USER_NAME=testuser1 make testacc TESTARGS='-run=TestAccSSOAdminAccountAssignment_' PKG=ssoadmin ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 2  -run=TestAccSSOAdminAccountAssignment_ -timeout 180m
=== RUN   TestAccSSOAdminAccountAssignment_Basic_group
=== PAUSE TestAccSSOAdminAccountAssignment_Basic_group
=== RUN   TestAccSSOAdminAccountAssignment_Basic_user
=== PAUSE TestAccSSOAdminAccountAssignment_Basic_user
=== RUN   TestAccSSOAdminAccountAssignment_disappears
=== PAUSE TestAccSSOAdminAccountAssignment_disappears
=== CONT  TestAccSSOAdminAccountAssignment_Basic_group
=== CONT  TestAccSSOAdminAccountAssignment_disappears
--- PASS: TestAccSSOAdminAccountAssignment_disappears (50.18s)
=== CONT  TestAccSSOAdminAccountAssignment_Basic_user
--- PASS: TestAccSSOAdminAccountAssignment_Basic_group (53.22s)
--- PASS: TestAccSSOAdminAccountAssignment_Basic_user (51.43s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin	107.440s
% make testacc TESTARGS='-run=TestAccSSOAdminCustomerManagedPolicyAttachment_' PKG=ssoadmin ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 2  -run=TestAccSSOAdminCustomerManagedPolicyAttachment_ -timeout 180m
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_basic
=== PAUSE TestAccSSOAdminCustomerManagedPolicyAttachment_basic
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
=== PAUSE TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_disappears
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_disappears (35.31s)
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet (28.71s)
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
=== PAUSE TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_basic
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_basic (40.38s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies (66.50s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew (67.17s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin	177.144s
% make testacc TESTARGS='-run=TestAccSSOAdminManagedPolicyAttachment_' PKG=ssoadmin ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 2  -run=TestAccSSOAdminManagedPolicyAttachment_ -timeout 180m
=== RUN   TestAccSSOAdminManagedPolicyAttachment_basic
=== PAUSE TestAccSSOAdminManagedPolicyAttachment_basic
=== RUN   TestAccSSOAdminManagedPolicyAttachment_forceNew
=== PAUSE TestAccSSOAdminManagedPolicyAttachment_forceNew
=== RUN   TestAccSSOAdminManagedPolicyAttachment_disappears
--- PASS: TestAccSSOAdminManagedPolicyAttachment_disappears (35.24s)
=== RUN   TestAccSSOAdminManagedPolicyAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdminManagedPolicyAttachment_Disappears_permissionSet (26.56s)
=== RUN   TestAccSSOAdminManagedPolicyAttachment_multipleManagedPolicies
=== PAUSE TestAccSSOAdminManagedPolicyAttachment_multipleManagedPolicies
=== CONT  TestAccSSOAdminManagedPolicyAttachment_basic
=== CONT  TestAccSSOAdminManagedPolicyAttachment_multipleManagedPolicies
--- PASS: TestAccSSOAdminManagedPolicyAttachment_basic (39.14s)
=== CONT  TestAccSSOAdminManagedPolicyAttachment_forceNew
--- PASS: TestAccSSOAdminManagedPolicyAttachment_multipleManagedPolicies (65.38s)
--- PASS: TestAccSSOAdminManagedPolicyAttachment_forceNew (68.02s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin	174.301s
% make testacc TESTARGS='-run=TestAccSSOAdminPermissionSetInlinePolicy_' PKG=ssoadmin ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 2  -run=TestAccSSOAdminPermissionSetInlinePolicy_ -timeout 180m
=== RUN   TestAccSSOAdminPermissionSetInlinePolicy_basic
=== PAUSE TestAccSSOAdminPermissionSetInlinePolicy_basic
=== RUN   TestAccSSOAdminPermissionSetInlinePolicy_update
=== PAUSE TestAccSSOAdminPermissionSetInlinePolicy_update
=== RUN   TestAccSSOAdminPermissionSetInlinePolicy_disappears
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_disappears (34.86s)
=== RUN   TestAccSSOAdminPermissionSetInlinePolicy_Disappears_permissionSet
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_Disappears_permissionSet (26.46s)
=== CONT  TestAccSSOAdminPermissionSetInlinePolicy_basic
=== CONT  TestAccSSOAdminPermissionSetInlinePolicy_update
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_basic (39.52s)
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_update (63.55s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin	130.143s
% make testacc TESTARGS='-run=TestAccSSOAdminPermissionsBoundaryAttachment_' PKG=ssoadmin ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 2  -run=TestAccSSOAdminPermissionsBoundaryAttachment_ -timeout 180m
=== RUN   TestAccSSOAdminPermissionsBoundaryAttachment_basic
=== PAUSE TestAccSSOAdminPermissionsBoundaryAttachment_basic
=== RUN   TestAccSSOAdminPermissionsBoundaryAttachment_forceNew
=== PAUSE TestAccSSOAdminPermissionsBoundaryAttachment_forceNew
=== RUN   TestAccSSOAdminPermissionsBoundaryAttachment_disappears
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_disappears (35.20s)
=== RUN   TestAccSSOAdminPermissionsBoundaryAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_Disappears_permissionSet (29.01s)
=== RUN   TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined
=== PAUSE TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_basic
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined (14.08s)
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_forceNew
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_basic (40.57s)
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_forceNew (67.64s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin	151.762s
% make testacc TESTARGS='-run=TestAccSSOAdminCustomerManagedPolicyAttachment_\|TestAccSSOAdminPermissionSet_' PKG=ssoadmin ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 2  -run=TestAccSSOAdminCustomerManagedPolicyAttachment_\|TestAccSSOAdminPermissionSet_ -timeout 180m
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_basic
=== PAUSE TestAccSSOAdminCustomerManagedPolicyAttachment_basic
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
=== PAUSE TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_disappears
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_disappears (38.47s)
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet (30.18s)
=== RUN   TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
=== PAUSE TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
=== RUN   TestAccSSOAdminPermissionSet_basic
=== PAUSE TestAccSSOAdminPermissionSet_basic
=== RUN   TestAccSSOAdminPermissionSet_tags
--- PASS: TestAccSSOAdminPermissionSet_tags (71.47s)
=== RUN   TestAccSSOAdminPermissionSet_updateDescription
=== PAUSE TestAccSSOAdminPermissionSet_updateDescription
=== RUN   TestAccSSOAdminPermissionSet_updateRelayState
=== PAUSE TestAccSSOAdminPermissionSet_updateRelayState
=== RUN   TestAccSSOAdminPermissionSet_updateSessionDuration
=== PAUSE TestAccSSOAdminPermissionSet_updateSessionDuration
=== RUN   TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration
=== PAUSE TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration
=== RUN   TestAccSSOAdminPermissionSet_mixedPolicyAttachments
=== PAUSE TestAccSSOAdminPermissionSet_mixedPolicyAttachments
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_basic
=== CONT  TestAccSSOAdminPermissionSet_updateRelayState
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_basic (39.04s)
=== CONT  TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration
--- PASS: TestAccSSOAdminPermissionSet_updateRelayState (52.82s)
=== CONT  TestAccSSOAdminPermissionSet_mixedPolicyAttachments
--- PASS: TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration (54.18s)
=== CONT  TestAccSSOAdminPermissionSet_updateSessionDuration
--- PASS: TestAccSSOAdminPermissionSet_mixedPolicyAttachments (61.48s)
=== CONT  TestAccSSOAdminPermissionSet_basic
--- PASS: TestAccSSOAdminPermissionSet_basic (27.13s)
=== CONT  TestAccSSOAdminPermissionSet_updateDescription
--- PASS: TestAccSSOAdminPermissionSet_updateSessionDuration (53.40s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
--- PASS: TestAccSSOAdminPermissionSet_updateDescription (54.30s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies (66.80s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew (68.68s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin	410.599s

frankpengau and others added 16 commits September 13, 2022 00:36
@frankpengau
26138: Managed Policy Attachment - Check before Create
cbaca56
@ewbankkit
r/aws_ssoadmin_account_assignment: Move functions around.
b543924
@ewbankkit
r/aws_ssoadmin_account_assignment: Tidy up 'FindAccountAssignment'.
0e568d9
@ewbankkit
r/aws_ssoadmin_account_assignment: Add 'findAccountAssignmentCreation…
32d2446 
…Status'.
@ewbankkit
r/aws_ssoadmin_account_assignment: Add 'findAccountAssignmentDeletion…
980b720 
…Status'.
@ewbankkit
r/aws_ssoadmin_account_assignment: Add configurable timeouts.
5d53ff8
@ewbankkit
r/aws_ssoadmin_account_assignment: Tidy up acceptance tests.
16c5df8
@ewbankkit
r/aws_ssoadmin_account_assignment: 'filter' has been removed.
a6bc5a4
@ewbankkit
r/aws_ssoadmin_permission_set: Move functions around.
1df3684
@ewbankkit
r/aws_ssoadmin_customer_managed_policy_attachment: Ad configurable ti…
7addc1d 
…meouts.
@ewbankkit
r/aws_ssoadmin_managed_policy_attachment: Add configurable timeouts.
43bcd35
@ewbankkit
r/aws_ssoadmin_permission_set_inline_policy: Add configurable timeouts.
facabbf
@ewbankkit
r/aws_ssoadmin_permissions_boundary_attachment: Add configurable time…
cb43761 
…outs.
@ewbankkit
r/aws_ssoadmin_permission_set: Add configurable timeouts.
1e75215
@ewbankkit
Pass timeout to 'provisionPermissionSet'.
113dd66
@ewbankkit
Cosmetics.
fc2adac
@github-actions
Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/ssoadmin Issues and PRs that pertain to the ssoadmin service. labels Aug 21, 2023
@terraform-aws-provider terraform-aws-provider bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 21, 2023
@ewbankkit ewbankkit mentioned this pull request Aug 21, 2023
Closed
@ewbankkit ewbankkit merged commit 54ddfc0 into main Aug 21, 2023
61 checks passed
@ewbankkit ewbankkit deleted the b-ssoadmin-better-error-messages branch August 21, 2023 21:34
@github-actions github-actions bot added this to the v5.14.0 milestone Aug 21, 2023
github-actions bot pushed a commit that referenced this pull request Aug 21, 2023
Update CHANGELOG.md for #33121
75cbc15
@Almenon
Copy link

Almenon commented Aug 22, 2023

Thanks!

@frankpengau
Copy link
Contributor

Thanks for addressing the issue! :)

This was referenced Aug 23, 2023
Merged
Closed
@github-actions
Copy link

This functionality has been released in v5.14.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

This was referenced Sep 6, 2023
Closed
Closed
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
@justinretzolk justinretzolk added the timeouts Pertains to timeout increases. label Feb 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/ssoadmin Issues and PRs that pertain to the ssoadmin service. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. timeouts Pertains to timeout increases.
Projects
None yet
Milestone
v5.14.0
4 participants
@ewbankkit @Almenon @frankpengau @justinretzolk