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: upgrade client to aws sdk v2 #34646

Merged
merged 12 commits into from
Nov 30, 2023
Merged

ssoadmin: upgrade client to aws sdk v2 #34646

merged 12 commits into from
Nov 30, 2023

Conversation

jar-b
Copy link
Member

@jar-b jar-b commented Nov 29, 2023

Description

Updates all ssoadmin resources and data sources to use AWS SDK For Go V2.

Relations

Relates #32976

Output from Acceptance Testing

% make testacc PKG=ssoadmin TESTS=TestAccSSOAdminInstancesDataSource_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminInstancesDataSource_'  -timeout 360m

--- PASS: TestAccSSOAdminInstancesDataSource_basic (24.41s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   27.676s
% make testacc PKG=ssoadmin TESTS=TestAccSSOAdminPermissionSet_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminPermissionSet_'  -timeout 360m

--- PASS: TestAccSSOAdminPermissionSet_basic (82.78s)
--- PASS: TestAccSSOAdminPermissionSet_updateDescription (142.16s)
--- PASS: TestAccSSOAdminPermissionSet_updateRelayState (142.38s)
--- PASS: TestAccSSOAdminPermissionSet_updateSessionDuration (142.83s)
--- PASS: TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration (143.25s)
--- PASS: TestAccSSOAdminPermissionSet_tags (182.39s)
--- PASS: TestAccSSOAdminPermissionSet_mixedPolicyAttachments (213.02s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   216.336s
% make testacc PKG=ssoadmin TESTS=TestAccSSOAdminPermissionSetDataSource_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminPermissionSetDataSource_'  -timeout 360m

--- PASS: TestAccSSOAdminPermissionSetDataSource_nonExistent (6.78s)
--- PASS: TestAccSSOAdminPermissionSetDataSource_arn (75.01s)
--- PASS: TestAccSSOAdminPermissionSetDataSource_name (76.30s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   79.465s
% AWS_IDENTITY_STORE_USER_NAME=tfacctest AWS_IDENTITY_STORE_GROUP_NAME=tfacctest make testacc PKG=ssoadmin TESTS=TestAccSSOAdminAccountAssignment_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminAccountAssignment_'  -timeout 360m

--- PASS: TestAccSSOAdminAccountAssignment_MissingPolicy (105.50s)
--- PASS: TestAccSSOAdminAccountAssignment_disappears (158.06s)
--- PASS: TestAccSSOAdminAccountAssignment_Basic_user (160.99s)
--- PASS: TestAccSSOAdminAccountAssignment_Basic_group (161.30s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   164.452s
% make testacc PKG=ssoadmin TESTS=TestAccSSOAdminCustomerManagedPolicyAttachment_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminCustomerManagedPolicyAttachment_'  -timeout 360m

--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet (159.92s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_basic (164.49s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_disappears (165.93s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew (261.69s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies (276.61s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   279.896s
% make testacc PKG=ssoadmin TESTS=TestAccSSOAdmin_serial
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdmin_serial'  -timeout 360m

--- PASS: TestAccSSOAdmin_serial (218.64s)
    --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes (218.64s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/basic (46.70s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/disappears (45.42s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/multiple (46.18s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/update (80.35s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   221.802s
% make testacc PKG=ssoadmin TESTS=TestAccSSOAdminPermissionSetInlinePolicy_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminPermissionSetInlinePolicy_'  -timeout 360m

--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_Disappears_permissionSet (151.68s)
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_basic (159.87s)
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_disappears (162.33s)
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_update (273.98s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   277.250s
% make testacc PKG=ssoadmin TESTS=TestAccSSOAdminPermissionsBoundaryAttachment_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 20 -run='TestAccSSOAdminPermissionsBoundaryAttachment_'  -timeout 360m

--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined (126.25s)
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_Disappears_permissionSet (182.07s)
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_disappears (186.42s)
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_basic (186.76s)
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_forceNew (276.56s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   279.939s
% make sweep SWEEPARGS=-sweep-run=aws_ssoadmin

2023/11/29 16:34:53 Sweeper Tests for region (us-west-1) ran successfully:
2023/11/29 16:34:53     - aws_ssoadmin_permission_set
2023/11/29 16:34:53     - aws_ssoadmin_account_assignment
ok      github.com/hashicorp/terraform-provider-aws/internal/sweep      6.572s

@github-actions 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. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/ssoadmin Issues and PRs that pertain to the ssoadmin service. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. client-connections Pertains to the AWS Client and service connections. generators Relates to code generators. labels Nov 29, 2023
ewbankkit
ewbankkit approved these changes Nov 29, 2023
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀.

@jar-b
internal/conns: upgrade ssoadmin client to aws sdk v2
3de914d
@jar-b
internal/acctest: update ssoadmin client
44d5efc
@jar-b
d/aws_ssoadmin_instances: upgrade aws sdk client
bccad2d
@jar-b
r/aws_ssoadmin_permission_set: upgrade aws sdk client
4ea9384
@jar-b
d/aws_ssoadmin_permission_set: upgrade aws sdk client
3fd4864
@jar-b
r/aws_ssoadmin_account_assignment: upgrade aws sdk client
69651ac
@jar-b
r/aws_ssoadmin_customer_managed_policy_attachment: upgrade aws sdk cl…
c78980e 
…ient
@jar-b
r/aws_ssoadmin_managed_policy_attachment: upgrade aws sdk client
10e3bd2
@jar-b
r/aws_ssoadmin_instance_access_control_attributes: upgrade aws sdk cl…
7804685 
…ient
@jar-b
r/aws_ssoadmin_permission_set_inline_policy: upgrade aws sdk client
034bc6a
@jar-b
r/aws_ssoadmin_permissions_boundary_attachment: upgrade aws sdk client
c795399
@jar-b
ssoadmin(sweeper): upgrade aws sdk client
91b4f82
@jar-b
Copy link
Member Author

jar-b commented Nov 30, 2023

Test results after rebase:

% make testacc PKG=ssoadmin ACCTEST_PARALLELISM=10
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ssoadmin/... -v -count 1 -parallel 10   -timeout 360m

=== NAME  TestAccSSOAdminAccountAssignment_Basic_group
    account_assignment_test.go:269: AWS_IDENTITY_STORE_GROUP_NAME env var must be set for AWS Identity Store Group acceptance test. This is required until ListGroups API returns results without filtering by name.
--- SKIP: TestAccSSOAdminAccountAssignment_Basic_group (0.34s)
=== CONT  TestAccSSOAdminPermissionSetInlinePolicy_update
--- PASS: TestAccSSOAdminPermissionSetDataSource_nonExistent (14.77s)
=== CONT  TestAccSSOAdminPermissionSetInlinePolicy_basic
=== RUN   TestAccSSOAdmin_serial/InstanceAccessControlAttributes/multiple
--- PASS: TestAccSSOAdminPermissionSet_basic (121.93s)
=== CONT  TestAccSSOAdminPermissionSet_mixedPolicyAttachments
--- PASS: TestAccSSOAdminPermissionSet_updateSessionDuration (216.27s)
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_basic
--- PASS: TestAccSSOAdminPermissionSet_updateDescription (218.20s)
=== CONT  TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration
=== RUN   TestAccSSOAdmin_serial/InstanceAccessControlAttributes/update
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_Disappears_permissionSet (258.48s)
=== CONT  TestAccSSOAdminPermissionSet_updateRelayState
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_disappears (271.19s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_basic (265.90s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies
--- PASS: TestAccSSOAdminPermissionSet_tags (311.65s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdminPermissionSet_RelayState_updateSessionDuration (214.47s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_disappears
=== RUN   TestAccSSOAdmin_serial/InstanceAccessControlAttributes/basic
--- PASS: TestAccSSOAdminPermissionSetInlinePolicy_update (460.10s)
=== CONT  TestAccSSOAdminAccountAssignment_disappears
    account_assignment_test.go:269: AWS_IDENTITY_STORE_GROUP_NAME env var must be set for AWS Identity Store Group acceptance test. This is required until ListGroups API returns results without filtering by name.
--- SKIP: TestAccSSOAdminAccountAssignment_disappears (0.17s)
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdminPermissionSet_updateRelayState (210.34s)
=== CONT  TestAccSSOAdminCustomerManagedPolicyAttachment_basic
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_forceNew (490.61s)
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_basic (279.71s)
=== CONT  TestAccSSOAdminPermissionsBoundaryAttachment_disappears
--- PASS: TestAccSSOAdminPermissionSet_mixedPolicyAttachments (377.20s)
=== CONT  TestAccSSOAdminAccountAssignment_MissingPolicy
    account_assignment_test.go:276: AWS_IDENTITY_STORE_USER_NAME env var must be set for AWS Identity Store User acceptance test. This is required until ListUsers API returns results without filtering by name.
--- SKIP: TestAccSSOAdminAccountAssignment_MissingPolicy (0.20s)
=== CONT  TestAccSSOAdminAccountAssignment_Basic_user
    account_assignment_test.go:276: AWS_IDENTITY_STORE_USER_NAME env var must be set for AWS Identity Store User acceptance test. This is required until ListUsers API returns results without filtering by name.
--- SKIP: TestAccSSOAdminAccountAssignment_Basic_user (0.15s)
=== CONT  TestAccSSOAdminManagedPolicyAttachment_Disappears_permissionSet
--- PASS: TestAccSSOAdmin_serial (563.45s)
    --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes (563.45s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/disappears (120.35s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/multiple (120.65s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/update (204.44s)
        --- PASS: TestAccSSOAdmin_serial/InstanceAccessControlAttributes/basic (118.00s)
=== CONT  TestAccSSOAdminPermissionSetDataSource_arn
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_Disappears_permissionSet (269.46s)
=== CONT  TestAccSSOAdminManagedPolicyAttachment_multipleManagedPolicies
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_managedPolicyAndCustomerManagedPolicyRefBothDefined (179.34s)
=== CONT  TestAccSSOAdminPermissionSetDataSource_name
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_disappears (279.58s)
=== CONT  TestAccSSOAdminManagedPolicyAttachment_forceNew
--- PASS: TestAccSSOAdminManagedPolicyAttachment_Disappears_permissionSet (234.02s)
=== CONT  TestAccSSOAdminManagedPolicyAttachment_basic
--- PASS: TestAccSSOAdminPermissionSetDataSource_arn (177.06s)
=== CONT  TestAccSSOAdminInstancesDataSource_basic
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_Disappears_permissionSet (282.31s)
=== CONT  TestAccSSOAdminManagedPolicyAttachment_disappears
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_basic (283.23s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_forceNew (488.23s)
--- PASS: TestAccSSOAdminPermissionsBoundaryAttachment_disappears (282.28s)
--- PASS: TestAccSSOAdminInstancesDataSource_basic (51.02s)
--- PASS: TestAccSSOAdminCustomerManagedPolicyAttachment_multipleManagedPolicies (518.72s)
--- PASS: TestAccSSOAdminPermissionSetDataSource_name (147.27s)
--- PASS: TestAccSSOAdminManagedPolicyAttachment_basic (154.61s)
--- PASS: TestAccSSOAdminManagedPolicyAttachment_disappears (148.61s)
--- PASS: TestAccSSOAdminManagedPolicyAttachment_multipleManagedPolicies (332.19s)
--- PASS: TestAccSSOAdminManagedPolicyAttachment_forceNew (250.94s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ssoadmin   966.539s

@jar-b jar-b merged commit c809ba8 into main Nov 30, 2023
44 checks passed
@jar-b jar-b deleted the td-ssoadmin-awssdkv2 branch November 30, 2023 16:29
@github-actions github-actions bot added this to the v5.29.0 milestone Nov 30, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 1, 2023

This functionality has been released in v5.29.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!

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 1, 2024

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 Jan 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees
No one assigned
Labels
client-connections Pertains to the AWS Client and service connections. generators Relates to code generators. service/ssoadmin Issues and PRs that pertain to the ssoadmin service. size/XL Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.29.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jar-b @ewbankkit