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.

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

Addressing Issue 32229 - cleaning up IAM_PATTERN properly #32243

Merged
merged 13 commits into from
Sep 6, 2023
Merged

Addressing Issue 32229 - cleaning up IAM_PATTERN properly #32243

merged 13 commits into from
Sep 6, 2023

Conversation

mc-etcher
Copy link
Contributor

@mc-etcher mc-etcher commented Jun 27, 2023

Description

This PR addresses issue 32229

Relations

Closes #32229
Closes #33038

References

Output from Acceptance Testing

$ make testacc PKG=servicecatalog TESTS='TestAccServiceCatalogPrincipalPortfolioAssociation'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/servicecatalog/... -v -count 1 -parallel 20 -run='TestAccServiceCatalogPrincipalPortfolioAssociation'  -timeout 180m
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern (44.34s)
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_basic (64.08s)
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_disappears (89.83s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog     95.463s

...

@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 service/servicecatalog Issues and PRs that pertain to the servicecatalog service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/M Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. labels Jun 27, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @mc-etcher 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@justinretzolk justinretzolk added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Jun 27, 2023
@github-actions github-actions bot added the sweeper Pertains to changes to or issues with the sweeper. label Jun 28, 2023
@mc-etcher mc-etcher marked this pull request as ready for review June 28, 2023 16:52
@mc-etcher mc-etcher changed the title DRAFT: addressing Issue 32229 - cleaning up IAM_PATTERN properly Addressing Issue 32229 - cleaning up IAM_PATTERN properly Jun 28, 2023
@boxrick
Copy link

boxrick commented Aug 1, 2023

This fixes an ongoing problem for me and would be amazing if its merged in.

% make testacc TESTARGS='-run=TestAccServiceCatalogPrincipalPortfolioAssociation_' PKG=servicecatalog ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/servicecatalog/... -v -count 1 -parallel 2  -run=TestAccServiceCatalogPrincipalPortfolioAssociation_ -timeout 180m
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_disappears (33.48s)
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_basic (36.61s)
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern (25.17s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog	63.818s
% make testacc TESTARGS='-run=TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0' PKG=servicecatalog ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/servicecatalog/... -v -count 1 -parallel 2  -run=TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0 -timeout 180m
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0 (113.69s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog	118.950s
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 🚀.

% make testacc TESTARGS='-run=TestAccServiceCatalogPrincipalPortfolioAssociation_' PKG=servicecatalog ACCTEST_PARALLELISM=2 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/servicecatalog/... -v -count 1 -parallel 2  -run=TestAccServiceCatalogPrincipalPortfolioAssociation_ -timeout 180m
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
=== RUN   TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0
=== PAUSE TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_basic
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_disappears
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_disappears (33.61s)
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_basic (37.13s)
=== CONT  TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_iam_pattern (28.01s)
--- PASS: TestAccServiceCatalogPrincipalPortfolioAssociation_migrateV0 (117.86s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog	160.253s

@ewbankkit
Copy link
Contributor

@mc-etcher Thanks for the contribution 🎉 👏.
I added a StateUpgrader to convert the resource's id attribute from the old 3-part format to the new 4-part format.

@ewbankkit ewbankkit merged commit 315cc9a into hashicorp:main Sep 6, 2023
41 checks passed
@github-actions github-actions bot added this to the v5.16.0 milestone Sep 6, 2023
@github-actions
Copy link

github-actions bot commented Sep 8, 2023

This functionality has been released in v5.16.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
Copy link

github-actions bot commented Oct 8, 2023

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 Oct 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. documentation Introduces or discusses updates to documentation. service/servicecatalog Issues and PRs that pertain to the servicecatalog service. size/M Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
4 participants