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

added single condition values handling #19533

Merged
merged 4 commits into from
Nov 25, 2021
Merged

added single condition values handling #19533

merged 4 commits into from
Nov 25, 2021

Conversation

phang98
Copy link
Contributor

@phang98 phang98 commented May 26, 2021

when the conditional values is single value it always cause an update. added the single condition values handling.

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 #18005

Output from acceptance testing:

╰─ make testacc  TESTARGS='-run=TestAccAWSDataSourceIAMPolicyDocument_' 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSDataSourceIAMPolicyDocument_ -timeout 180m
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_basic
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_basic
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_source
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_source
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_sourceList
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_sourceList
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_sourceConflicting
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_sourceConflicting
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_sourceListConflicting
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_sourceListConflicting
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_override
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_override
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_overrideList
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_overrideList
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_noStatementMerge
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_noStatementMerge
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_noStatementOverride
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_noStatementOverride
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_duplicateSid
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_duplicateSid
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_stringAndSlice
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_stringAndSlice
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipals
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipals
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipalsGov
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipalsGov
=== RUN   TestAccAWSDataSourceIAMPolicyDocument_version20081017
=== PAUSE TestAccAWSDataSourceIAMPolicyDocument_version20081017
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_basic
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_noStatementOverride
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_sourceList
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_sourceConflicting
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipalsGov
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_source
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_stringAndSlice
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipals
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_sourceListConflicting
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_duplicateSid
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_override
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_noStatementMerge
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_overrideList
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_version20081017
=== CONT  TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipalsGov
    provider_test.go:779: skipping tests; current partition (aws) does not equal aws-us-gov
--- SKIP: TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipalsGov (4.19s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_sourceListConflicting (33.23s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_sourceList (180.82s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_basic (182.57s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_multiplePrincipals (184.01s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_statementPrincipalIdentifiers_stringAndSlice (184.52s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_noStatementOverride (185.19s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_duplicateSid (196.51s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_sourceConflicting (200.84s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_noStatementMerge (201.96s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_overrideList (213.69s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_override (220.10s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_version20081017 (264.72s)
--- PASS: TestAccAWSDataSourceIAMPolicyDocument_source (306.80s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       310.091s

...

@phang98 phang98 requested a review from a team as a code owner May 26, 2021 14:23
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. labels May 26, 2021
@github-actions github-actions bot added service/iam Issues and PRs that pertain to the iam service. needs-triage Waiting for first response or review from a maintainer. labels May 26, 2021
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 @phang98 👋

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 CONTRIBUTING 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! 😃

@phang98 phang98 marked this pull request as draft June 29, 2021 11:17
@phang98 phang98 marked this pull request as ready for review June 29, 2021 11:18
@phang98
Copy link
Contributor Author

phang98 commented Sep 1, 2021

@teamterraform
What is the next step to get this PR review?

@breathingdust breathingdust added regression Pertains to a degraded workflow resulting from an upstream patch or internal enhancement. bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Sep 3, 2021
@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.

@phang98
Copy link
Contributor Author

phang98 commented Oct 21, 2021

@zhelding I've rebase from the latest main and updated the PR to the new structure. Please review.

@gdavison gdavison self-assigned this Nov 24, 2021
@github-actions github-actions bot added size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed size/XS Managed by automation to categorize the size of a PR. labels Nov 25, 2021
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

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

Thanks for the PR, @phang98! I've added an acceptance test to validate the change.

Results of acceptance tests

--- PASS: TestAccIAMPolicyDocumentDataSource_sourceListConflicting (52.65s)
--- PASS: TestAccIAMPolicyDocumentDataSource_sourceConflicting (169.58s)
--- PASS: TestAccIAMPolicyDocumentDataSource_sourceList (174.88s)
--- PASS: TestAccIAMPolicyDocumentDataSource_StatementPrincipalIdentifiers_stringAndSlice (177.24s)
--- PASS: TestAccIAMPolicyDocumentDataSource_singleConditionValue (177.64s)
--- PASS: TestAccIAMPolicyDocumentDataSource_noStatementMerge (178.26s)
--- PASS: TestAccIAMPolicyDocumentDataSource_StatementPrincipalIdentifiers_multiplePrincipals (178.82s)
--- PASS: TestAccIAMPolicyDocumentDataSource_overrideList (178.98s)
--- PASS: TestAccIAMPolicyDocumentDataSource_noStatementOverride (179.01s)
--- PASS: TestAccIAMPolicyDocumentDataSource_override (179.03s)
--- PASS: TestAccIAMPolicyDocumentDataSource_basic (179.07s)
--- PASS: TestAccIAMPolicyDocumentDataSource_duplicateSid (180.60s)
--- PASS: TestAccIAMPolicyDocumentDataSource_version20081017 (199.43s)
--- PASS: TestAccIAMPolicyDocumentDataSource_source (206.56s)

@github-actions
Copy link

github-actions bot commented Dec 1, 2021

This functionality has been released in v3.67.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 Jun 7, 2022

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 Jun 7, 2022
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. regression Pertains to a degraded workflow resulting from an upstream patch or internal enhancement. service/iam Issues and PRs that pertain to the iam service. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws_efs_file_system_policy Document Always Changes With Single Conditions v3.31.0
4 participants