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

s3: Preserve order in JSON/policy arrays #21997

Merged
merged 8 commits into from
Dec 2, 2021
Merged

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

Related #21968
Related #11801

Fixes #13144
Fixes #18878
Fixes #19627
Fixes #20107
Fixes #20456

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

--- PASS: TestAccS3Bucket_Security_policy (78.33s)

--- PASS: TestAccS3BucketPolicy_basic (28.25s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (46.54s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (75.62s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (80.42s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (142.76s)

% make testacc TESTS=TestAccS3Bucket_ PKG=s3               
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3Bucket_' -timeout 180m
--- PASS: TestAccS3Bucket_Basic_namePrefix (45.66s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (45.99s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (51.51s)
--- PASS: TestAccS3Bucket_Basic_basic (53.51s)
--- PASS: TestAccS3Bucket_Basic_generatedName (53.94s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (55.53s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (69.21s)
--- PASS: TestAccS3Bucket_Security_grantToACL (79.58s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (82.44s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (38.66s)
--- PASS: TestAccS3Bucket_Security_updateACL (88.05s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (88.56s)
--- PASS: TestAccS3Bucket_Web_routingRules (93.84s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (93.84s)
--- PASS: TestAccS3Bucket_Basic_acceleration (94.71s)
--- PASS: TestAccS3Bucket_Security_logging (58.30s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (29.48s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (52.52s)
--- PASS: TestAccS3Bucket_Security_policy (122.50s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (129.98s)
--- PASS: TestAccS3Bucket_Web_simple (130.65s)
--- PASS: TestAccS3Bucket_Manage_objectLock (85.88s)
--- PASS: TestAccS3Bucket_Manage_versioning (138.37s)
--- PASS: TestAccS3Bucket_Security_updateGrant (138.38s)
--- PASS: TestAccS3Bucket_Web_redirect (138.73s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (59.46s)
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (30.04s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (88.50s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (78.79s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (43.09s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (75.24s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (81.92s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (82.03s)
--- PASS: TestAccS3Bucket_Security_corsDelete (39.49s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (49.08s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (48.08s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (69.74s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (128.61s)
--- PASS: TestAccS3Bucket_Basic_emptyString (44.07s)
--- PASS: TestAccS3Bucket_Tags_basic (50.45s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (76.36s)
--- PASS: TestAccS3Bucket_Tags_ignoreTags (68.57s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (96.87s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (182.58s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (121.16s)
--- PASS: TestAccS3Bucket_Replication_basic (169.65s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (153.54s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (201.68s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	297.403s

Output from acceptance testing (GovCloud):

--- PASS: TestAccS3BucketPolicy_basic (38.99s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (63.20s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (95.78s)
--- PASS: TestAccS3Bucket_Security_policy (99.23s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (102.92s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (162.31s)

@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 2, 2021
@YakDriver YakDriver added this to the Roadmap milestone Dec 2, 2021
@YakDriver YakDriver merged commit 6e9f54b into main Dec 2, 2021
@YakDriver YakDriver deleted the b-preserve-s3-policy-order branch December 2, 2021 01:57
@github-actions github-actions bot modified the milestones: Roadmap, v3.68.0 Dec 2, 2021
github-actions bot pushed a commit that referenced this pull request Dec 2, 2021
@YakDriver YakDriver self-assigned this Dec 2, 2021
@github-actions
Copy link

github-actions bot commented Dec 2, 2021

This functionality has been released in v3.68.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 4, 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 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
service/s3 Issues and PRs that pertain to the s3 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