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

f-DeleteUnusedFMManagedResources support for aws_fms_policy resource #21295

Merged
merged 31 commits into from
Feb 17, 2022

Conversation

CloudCally
Copy link
Contributor

@CloudCally CloudCally commented Oct 13, 2021

Community Note

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

Closes #21294.
Closes #18037.
Closes #19961.

Output from acceptance testing:

Unable to run tests in current env.

I was able to run a plan/apply on an existing resource after building the provider and it did function as intended.
...

@github-actions github-actions bot added needs-triage Waiting for first response or review from a maintainer. documentation Introduces or discusses updates to documentation. service/fms Issues and PRs that pertain to the fms service. size/XS Managed by automation to categorize the size of a PR. labels Oct 13, 2021
@CloudCally CloudCally marked this pull request as ready for review October 13, 2021 21:05
@CloudCally CloudCally changed the title [WIP] f-DeleteUnusedFMManagedResources support for aws_fms_policy resource f-DeleteUnusedFMManagedResources support for aws_fms_policy resource Oct 13, 2021
@justinretzolk justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Oct 14, 2021
@zhelding
Copy link
Contributor

Merging branch main to bring in line with service packages refactor done by #21306.

Confirming that in some PRs, a simple git pull origin main is sufficient to resolve merge conflicts.

@zhelding
Copy link
Contributor

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

@CloudCally
Copy link
Contributor Author

Hello, @zhelding, is there anything more you need me to do to get this merged?

@zhelding
Copy link
Contributor

zhelding commented Nov 4, 2021

Hi @CloudCally. No further action is required on your end for merging this pull request.

I originally pushed commits to this pull request as a proof of concept for our general process of aligning code with our recent service packages refactor.

This pull request will now be addressed via our standard prioritization process. Unfortunately, given the large quantity of issues and pull requests we receive, we are not always able to review every pull request in a timely manner.

We prioritize contributions that provide the greatest value to the largest number of users -- which we primarily infer based on the number of 👍 reactions. Additionally, an explanation of the particular use case for a contribution can provide information on how the changes might be useful in a broader context.

You can get a view of the wider development plans for the provider via our road map, published quarterly.

Thank you again for your contribution and your patience.

@github-actions github-actions bot added the tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. label Dec 23, 2021
@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. and removed size/XS Managed by automation to categorize the size of a PR. labels Feb 17, 2022
…ement account.

Acceptance test output:

% make testacc TESTS=TestAccFMS_serial/Policy/basic PKG=fms
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/fms/... -v -count 1 -parallel 20 -run='TestAccFMS_serial/Policy/basic'  -timeout 180m
=== RUN   TestAccFMS_serial
=== RUN   TestAccFMS_serial/Policy
=== RUN   TestAccFMS_serial/Policy/basic
--- PASS: TestAccFMS_serial (1111.90s)
    --- PASS: TestAccFMS_serial/Policy (1111.90s)
        --- PASS: TestAccFMS_serial/Policy/basic (1111.90s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms	1115.900s
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Feb 17, 2022
@github-actions github-actions bot added generators Relates to code generators. tags Pertains to resource tagging. labels Feb 17, 2022
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 TESTS=TestAccFMS_serial/Policy/basic PKG=fms
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/fms/... -v -count 1 -parallel 20 -run='TestAccFMS_serial/Policy/basic'  -timeout 180m
=== RUN   TestAccFMS_serial
=== RUN   TestAccFMS_serial/Policy
=== RUN   TestAccFMS_serial/Policy/basic
--- PASS: TestAccFMS_serial (2082.58s)
    --- PASS: TestAccFMS_serial/Policy (2082.58s)
        --- PASS: TestAccFMS_serial/Policy/basic (2082.58s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms	2086.071s
% make testacc TESTS=TestAccFMS_serial/Policy/tags PKG=fms
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/fms/... -v -count 1 -parallel 20 -run='TestAccFMS_serial/Policy/tags'  -timeout 180m
=== RUN   TestAccFMS_serial
=== RUN   TestAccFMS_serial/Policy
=== RUN   TestAccFMS_serial/Policy/tags
--- PASS: TestAccFMS_serial (1191.19s)
    --- PASS: TestAccFMS_serial/Policy (1191.19s)
        --- PASS: TestAccFMS_serial/Policy/tags (1191.19s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms	1194.907s

@ewbankkit
Copy link
Contributor

@CloudCally @Victorp99 Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 3997011 into hashicorp:main Feb 17, 2022
@github-actions github-actions bot added this to the v4.2.0 milestone Feb 17, 2022
@github-actions
Copy link

This functionality has been released in v4.2.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

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 May 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. generators Relates to code generators. service/fms Issues and PRs that pertain to the fms service. size/XL Managed by automation to categorize the size of a PR. tags Pertains to resource tagging. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
5 participants