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

ecr: Preserve/ignore order in JSON/policy #22004

Merged
merged 10 commits into from
Dec 2, 2021

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Dec 2, 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 #19365
Closes #8905
Closes #22018
Related #21968
Related #11801

Output from acceptance testing (us-west-2):

--- PASS: TestAccECRRepositoryPolicy_Disappears_repository (12.51s)
--- PASS: TestAccECRRepositoryPolicy_disappears (14.07s)
--- PASS: TestAccECRRepositoryPolicy_IAM_basic (26.41s)
--- PASS: TestAccECRRepositoryPolicy_basic (27.86s)
--- PASS: TestAccECRRepositoryPolicy_IAM_principalOrder (40.62s)

--- PASS: TestAccECRRegistryPolicy_serial (32.32s)
    --- PASS: TestAccECRRegistryPolicy_serial/basic (22.42s)
    --- PASS: TestAccECRRegistryPolicy_serial/disappears (9.90s)

% make testacc TESTS=TestAccIAMRole PKG=iam                  
 ==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/iam/... -v -count 1 -parallel 20 -run='TestAccIAMRole' -timeout 180m
--- PASS: TestAccIAMRolePolicy_invalidJSON (4.15s)
--- PASS: TestAccIAMRole_badJSON (5.75s)
--- PASS: TestAccIAMRolePolicy_Policy_invalidResource (15.82s)
--- PASS: TestAccIAMRolesDataSource_nonExistentPathPrefix (18.70s)
--- PASS: TestAccIAMRole_disappears (23.76s)
--- PASS: TestAccIAMRolePolicyAttachment_Disappears_role (24.55s)
--- PASS: TestAccIAMRolesDataSource_basic (21.60s)
--- PASS: TestAccIAMRolesDataSource_pathPrefix (27.55s)
--- PASS: TestAccIAMRolePolicyAttachment_disappears (27.68s)
--- PASS: TestAccIAMRolePolicy_disappears (27.71s)
--- PASS: TestAccIAMRolesDataSource_nameRegexAndPathPrefix (28.13s)
--- PASS: TestAccIAMRolesDataSource_nameRegex (28.27s)
--- PASS: TestAccIAMRoleDataSource_basic (28.35s)
--- PASS: TestAccIAMRole_nameGenerated (32.09s)
--- PASS: TestAccIAMRole_namePrefix (32.72s)
--- PASS: TestAccIAMRole_ForceDetach_policies (33.18s)
--- PASS: TestAccIAMRolePolicy_generatedName (54.68s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_managedEmpty (49.03s)
--- PASS: TestAccIAMRole_policyBasicInlineEmpty (27.39s)
--- PASS: TestAccIAMRolePolicy_namePrefix (55.96s)
--- PASS: TestAccIAMRolePolicy_basic (56.03s)
--- PASS: TestAccIAMRole_testNameChange (56.35s)
--- PASS: TestAccIAMRole_maxSessionDuration (58.98s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_inlineEmpty (45.88s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionIgnored_managedNonExistent (43.04s)
--- PASS: TestAccIAMRole_basic (28.68s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_inlineNonEmpty (44.25s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_managedNonEmpty (43.55s)
--- PASS: TestAccIAMRole_PolicyOutOfBandRemovalAddedBack_inlineNonEmpty (43.37s)
--- PASS: TestAccIAMRole_PolicyOutOfBandRemovalAddedBack_managedNonEmpty (43.90s)
--- PASS: TestAccIAMRole_tags (44.01s)
--- PASS: TestAccIAMRoleDataSource_tags (17.98s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionIgnored_inlineNonExistent (50.78s)
--- PASS: TestAccIAMRole_basicWithDescription (50.64s)
--- PASS: TestAccIAMRole_policyBasicInline (55.58s)
--- PASS: TestAccIAMRole_policyBasicManaged (56.36s)
--- PASS: TestAccIAMRolePolicyAttachment_basic (30.44s)
--- PASS: TestAccIAMRole_permissionsBoundary (67.54s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/iam	100.929s

Output from acceptance testing (GovCloud):

--- PASS: TestAccECRRepositoryPolicy_Disappears_repository (15.49s)
--- PASS: TestAccECRRepositoryPolicy_disappears (17.88s)
--- PASS: TestAccECRRepositoryPolicy_IAM_basic (30.57s)
--- PASS: TestAccECRRepositoryPolicy_basic (34.02s)
--- PASS: TestAccECRRepositoryPolicy_IAM_principalOrder (52.57s)

--- PASS: TestAccECRRegistryPolicy_serial (16.05s)
    --- SKIP: TestAccECRRegistryPolicy_serial/basic (8.66s)
    --- SKIP: TestAccECRRegistryPolicy_serial/disappears (7.39s)

% make testacc TESTS=TestAccIAMRole PKG=iam            
TF_ACC=1 go test ./internal/service/iam/... -v -count 1 -parallel 20 -run='TestAccIAMRole' -timeout 180m
--- PASS: TestAccIAMRole_badJSON (8.70s)
--- PASS: TestAccIAMRolePolicy_Policy_invalidResource (24.90s)
--- PASS: TestAccIAMRolesDataSource_nonExistentPathPrefix (28.16s)
--- PASS: TestAccIAMRole_disappears (37.76s)
--- PASS: TestAccIAMRolesDataSource_nameRegexAndPathPrefix (42.82s)
--- PASS: TestAccIAMRoleDataSource_basic (42.84s)
--- PASS: TestAccIAMRolesDataSource_pathPrefix (42.92s)
--- PASS: TestAccIAMRolePolicy_invalidJSON (3.28s)
--- PASS: TestAccIAMRole_nameGenerated (49.62s)
--- PASS: TestAccIAMRole_basic (49.77s)
--- PASS: TestAccIAMRole_namePrefix (49.91s)
--- PASS: TestAccIAMRolesDataSource_nameRegex (51.35s)
--- PASS: TestAccIAMRole_ForceDetach_policies (52.34s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionIgnored_managedNonExistent (69.44s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_inlineEmpty (71.55s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_managedEmpty (72.20s)
--- PASS: TestAccIAMRolePolicy_basic (74.80s)
--- PASS: TestAccIAMRole_maxSessionDuration (84.41s)
--- PASS: TestAccIAMRole_policyBasicInlineEmpty (36.74s)
--- PASS: TestAccIAMRole_testNameChange (88.28s)
--- PASS: TestAccIAMRolesDataSource_basic (88.59s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_inlineNonEmpty (67.63s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionIgnored_inlineNonExistent (96.18s)
--- PASS: TestAccIAMRole_PolicyOutOfBandAdditionRemoved_managedNonEmpty (70.05s)
--- PASS: TestAccIAMRole_PolicyOutOfBandRemovalAddedBack_inlineNonEmpty (63.22s)
--- PASS: TestAccIAMRole_basicWithDescription (105.05s)
--- PASS: TestAccIAMRolePolicyAttachment_disappears (32.86s)
--- PASS: TestAccIAMRolePolicy_disappears (35.63s)
--- PASS: TestAccIAMRole_PolicyOutOfBandRemovalAddedBack_managedNonEmpty (65.27s)
--- PASS: TestAccIAMRole_tags (62.15s)
--- PASS: TestAccIAMRoleDataSource_tags (28.77s)
--- PASS: TestAccIAMRolePolicyAttachment_Disappears_role (27.90s)
--- PASS: TestAccIAMRolePolicy_generatedName (66.67s)
--- PASS: TestAccIAMRolePolicy_namePrefix (63.76s)
--- PASS: TestAccIAMRolePolicyAttachment_basic (58.67s)
--- PASS: TestAccIAMRole_policyBasicManaged (91.09s)
--- PASS: TestAccIAMRole_policyBasicInline (87.14s)
--- PASS: TestAccIAMRole_permissionsBoundary (110.96s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/iam	164.127s

@github-actions github-actions bot added service/ecr Issues and PRs that pertain to the ecr service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/S Managed by automation to categorize the size of a PR. labels Dec 2, 2021
@YakDriver YakDriver marked this pull request as draft December 2, 2021 02:35
@YakDriver YakDriver self-assigned this Dec 2, 2021
@YakDriver YakDriver added this to the Roadmap milestone Dec 2, 2021
@YakDriver YakDriver changed the title "[WIP] ecr: Preserve/ignore order in JSON/policy" [WIP] ecr: Preserve/ignore order in JSON/policy Dec 2, 2021
@YakDriver YakDriver marked this pull request as ready for review December 2, 2021 15:57
@YakDriver YakDriver changed the title [WIP] ecr: Preserve/ignore order in JSON/policy ecr: Preserve/ignore order in JSON/policy Dec 2, 2021
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. and removed size/S Managed by automation to categorize the size of a PR. labels Dec 2, 2021
@github-actions github-actions bot added the service/iam Issues and PRs that pertain to the iam service. label Dec 2, 2021
@YakDriver YakDriver merged commit 3dbc25e into main Dec 2, 2021
@YakDriver YakDriver deleted the b-ecr-preserve-json-policy-order branch December 2, 2021 18:22
@github-actions github-actions bot modified the milestones: Roadmap, v3.69.0 Dec 2, 2021
github-actions bot pushed a commit that referenced this pull request Dec 2, 2021
@github-actions
Copy link

This functionality has been released in v3.69.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 3, 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 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
service/ecr Issues and PRs that pertain to the ecr service. service/iam Issues and PRs that pertain to the iam 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.
Projects
None yet
1 participant