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.

Sign up for GitHub

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

Jump to bottom

r/s3_bucket: read-only object_lock_configuration rule argument #22612

Merged
merged 9 commits into from
Feb 7, 2022
Merged

r/s3_bucket: read-only object_lock_configuration rule argument #22612

merged 9 commits into from
Feb 7, 2022

Conversation

anGie44
Copy link
Contributor

@anGie44 anGie44 commented Jan 16, 2022 •
edited
Loading

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

Relates #4418
Relates #20433

Output from acceptance testing:

--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_empty (13.92s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_multipleTags (167.33s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_prefix (165.82s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_prefixAndTags (167.76s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_remove (167.56s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_singleTag (160.88s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_default (100.14s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_empty (14.67s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_full (99.36s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_basic (97.80s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_removed (151.52s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_updateBasic (236.28s)

--- PASS: TestAccS3BucketDataSource_basic (86.06s)
--- PASS: TestAccS3BucketDataSource_website (84.48s)

--- PASS: TestAccS3BucketIntelligentTieringConfiguration_Filter (367.86s)
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_basic (96.53s)
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_disappears (85.73s)

--- PASS: TestAccS3BucketInventory_basic (100.45s)
--- PASS: TestAccS3BucketInventory_encryptWithSSEKMS (98.18s)
--- PASS: TestAccS3BucketInventory_encryptWithSSES3 (99.96s)

--- PASS: TestAccS3BucketMetric_basic (95.80s)
--- PASS: TestAccS3BucketMetric_withEmptyFilter (14.29s)
--- PASS: TestAccS3BucketMetric_withFilterMultipleTags (162.68s)
--- PASS: TestAccS3BucketMetric_withFilterPrefix (163.69s)
--- PASS: TestAccS3BucketMetric_withFilterPrefixAndMultipleTags (163.36s)
--- PASS: TestAccS3BucketMetric_withFilterPrefixAndSingleTag (164.93s)
--- PASS: TestAccS3BucketMetric_withFilterSingleTag (165.52s)

--- PASS: TestAccS3BucketNotification_LambdaFunctionLambdaFunctionARN_alias (121.52s)
--- PASS: TestAccS3BucketNotification_Topic_multiple (98.08s)
--- PASS: TestAccS3BucketNotification_lambdaFunction (116.27s)
--- PASS: TestAccS3BucketNotification_queue (127.38s)
--- PASS: TestAccS3BucketNotification_topic (95.83s)
--- PASS: TestAccS3BucketNotification_update (183.00s)

--- PASS: TestAccS3BucketObjectDataSource_allParams (84.55s)
--- PASS: TestAccS3BucketObjectDataSource_basic (83.72s)
--- PASS: TestAccS3BucketObjectDataSource_basicViaAccessPoint (85.93s)
--- PASS: TestAccS3BucketObjectDataSource_bucketKeyEnabled (86.69s)
--- PASS: TestAccS3BucketObjectDataSource_kmsEncrypted (88.32s)
--- PASS: TestAccS3BucketObjectDataSource_leadingSlash (159.48s)
--- PASS: TestAccS3BucketObjectDataSource_multipleSlashes (157.96s)
--- PASS: TestAccS3BucketObjectDataSource_objectLockLegalHoldOff (84.97s)
--- PASS: TestAccS3BucketObjectDataSource_objectLockLegalHoldOn (85.54s)
--- PASS: TestAccS3BucketObjectDataSource_readableBody (87.79s)
--- PASS: TestAccS3BucketObjectDataSource_singleSlashAsKey (84.67s)

--- PASS: TestAccS3BucketObject_acl (243.46s)
--- PASS: TestAccS3BucketObject_bucketBucketKeyEnabled (88.52s)
--- PASS: TestAccS3BucketObject_content (101.12s)
--- PASS: TestAccS3BucketObject_contentBase64 (87.83s)
--- PASS: TestAccS3BucketObject_defaultBucketSSE (87.93s)
--- PASS: TestAccS3BucketObject_empty (101.73s)
--- PASS: TestAccS3BucketObject_etagEncryption (100.98s)
--- PASS: TestAccS3BucketObject_ignoreTags (158.02s)
--- PASS: TestAccS3BucketObject_kms (101.32s)
--- PASS: TestAccS3BucketObject_metadata (240.68s)
--- PASS: TestAccS3BucketObject_noNameNoKey (22.74s)
--- PASS: TestAccS3BucketObject_nonVersioned (99.47s)
--- PASS: TestAccS3BucketObject_objectBucketKeyEnabled (90.02s)
--- PASS: TestAccS3BucketObject_objectLockLegalHoldStartWithNone (230.61s)
--- PASS: TestAccS3BucketObject_objectLockLegalHoldStartWithOn (157.80s)
--- PASS: TestAccS3BucketObject_objectLockRetentionStartWithNone (230.74s)
--- PASS: TestAccS3BucketObject_objectLockRetentionStartWithSet (301.07s)
--- PASS: TestAccS3BucketObject_source (98.90s)
--- PASS: TestAccS3BucketObject_sourceHashTrigger (167.01s)
--- PASS: TestAccS3BucketObject_sse (100.39s)
--- PASS: TestAccS3BucketObject_storageClass (388.15s)
--- PASS: TestAccS3BucketObject_tags (312.40s)
--- PASS: TestAccS3BucketObject_tagsLeadingMultipleSlashes (300.06s)
--- PASS: TestAccS3BucketObject_tagsLeadingSingleSlash (314.85s)
--- PASS: TestAccS3BucketObject_tagsMultipleSlashes (299.74s)
--- PASS: TestAccS3BucketObject_updateSameFile (153.92s)
--- PASS: TestAccS3BucketObject_updates (171.55s)
--- PASS: TestAccS3BucketObject_updatesWithVersioning (168.42s)
--- PASS: TestAccS3BucketObject_updatesWithVersioningViaAccessPoint (159.10s)
--- PASS: TestAccS3BucketObject_withContentCharacteristics (87.42s)

--- PASS: TestAccS3BucketObjectsDataSource_all (161.01s)
--- PASS: TestAccS3BucketObjectsDataSource_basic (163.66s)
--- PASS: TestAccS3BucketObjectsDataSource_basicViaAccessPoint (163.77s)
--- PASS: TestAccS3BucketObjectsDataSource_encoded (163.79s)
--- PASS: TestAccS3BucketObjectsDataSource_fetchOwner (163.93s)
--- PASS: TestAccS3BucketObjectsDataSource_maxKeys (161.79s)
--- PASS: TestAccS3BucketObjectsDataSource_prefixes (164.68s)
--- PASS: TestAccS3BucketObjectsDataSource_startAfter (163.92s)

--- PASS: TestAccS3BucketOwnershipControls_Disappears_bucket (78.67s)
--- PASS: TestAccS3BucketOwnershipControls_Rule_objectOwnership (175.29s)
--- PASS: TestAccS3BucketOwnershipControls_basic (103.28s)
--- PASS: TestAccS3BucketOwnershipControls_disappears (89.18s)

--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (348.83s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (268.33s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (289.46s)

--- PASS: TestAccS3BucketPolicy_basic (103.15s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (179.30s)

--- PASS: TestAccS3BucketPublicAccessBlock_Disappears_bucket (77.95s)
--- PASS: TestAccS3BucketPublicAccessBlock_basic (106.18s)
--- PASS: TestAccS3BucketPublicAccessBlock_blockPublicACLs (246.84s)
--- PASS: TestAccS3BucketPublicAccessBlock_blockPublicPolicy (247.22s)
--- PASS: TestAccS3BucketPublicAccessBlock_disappears (87.84s)
--- PASS: TestAccS3BucketPublicAccessBlock_ignorePublicACLs (243.87s)
--- PASS: TestAccS3BucketPublicAccessBlock_restrictPublicBuckets (241.83s)

--- PASS: TestAccS3BucketReplicationConfiguration_basic (530.22s)
--- PASS: TestAccS3BucketReplicationConfiguration_configurationRuleDestinationAccessControlTranslation (481.88s)
--- PASS: TestAccS3BucketReplicationConfiguration_configurationRuleDestinationAddAccessControlTranslation (471.18s)
--- PASS: TestAccS3BucketReplicationConfiguration_disappears (134.79s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_andOperator (346.61s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_tagFilter (357.55s)
--- PASS: TestAccS3BucketReplicationConfiguration_multipleDestinationsEmptyFilter (405.67s)
--- PASS: TestAccS3BucketReplicationConfiguration_multipleDestinationsNonEmptyFilter (402.42s)
--- PASS: TestAccS3BucketReplicationConfiguration_replicaModifications (399.21s)
--- PASS: TestAccS3BucketReplicationConfiguration_replicationTimeControl (398.94s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2 (391.53s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2DestinationMetrics (366.07s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2SameRegion (234.62s)
--- PASS: TestAccS3BucketReplicationConfiguration_twoDestination (403.77s)
--- PASS: TestAccS3BucketReplicationConfiguration_withoutPrefix (306.94s)
--- PASS: TestAccS3BucketReplicationConfiguration_withoutStorageClass (396.88s)

--- PASS: TestAccS3BucketVersioning_MFADelete (57.62s)
--- PASS: TestAccS3BucketVersioning_basic (91.56s)
--- PASS: TestAccS3BucketVersioning_disappears (83.46s)
--- PASS: TestAccS3BucketVersioning_update (92.56s)

--- PASS: TestAccS3Bucket_Basic_acceleration (54.81s)
--- PASS: TestAccS3Bucket_Basic_basic (53.94s)
--- PASS: TestAccS3Bucket_Basic_emptyString (52.46s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (92.45s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (95.24s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (87.26s)
--- PASS: TestAccS3Bucket_Basic_generatedName (31.30s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (46.27s)
--- PASS: TestAccS3Bucket_Basic_namePrefix (32.32s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (48.24s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (33.17s)
--- PASS: TestAccS3Bucket_Manage_MfaDeleteDisabled (64.61s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (215.84s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (168.65s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (95.09s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (77.29s)
--- PASS: TestAccS3Bucket_Manage_objectLock (106.00s)
--- PASS: TestAccS3Bucket_Manage_objectLockWithVersioning (106.39s)
--- PASS: TestAccS3Bucket_Manage_versioning (125.90s)
--- PASS: TestAccS3Bucket_Manage_versioningAndMfaDeleteDisabled (67.29s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (62.46s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (242.24s)
--- PASS: TestAccS3Bucket_Replication_basic (274.46s)
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (71.90s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (156.40s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (159.71s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (204.77s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (205.43s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (279.92s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (111.72s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (160.79s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (156.29s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (156.96s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (46.35s)
--- PASS: TestAccS3Bucket_Security_corsDelete (59.96s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (73.52s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (145.11s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (92.98s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (45.01s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (46.63s)
--- PASS: TestAccS3Bucket_Security_grantToACL (50.79s)
--- PASS: TestAccS3Bucket_Security_logging (75.42s)
--- PASS: TestAccS3Bucket_Security_policy (67.41s)
--- PASS: TestAccS3Bucket_Security_updateACL (46.98s)
--- PASS: TestAccS3Bucket_Security_updateGrant (70.12s)
--- PASS: TestAccS3Bucket_Tags_basic (31.67s)
--- PASS: TestAccS3Bucket_Tags_ignoreTags (49.34s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (116.76s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (145.80s)
--- PASS: TestAccS3Bucket_Web_redirect (104.47s)
--- PASS: TestAccS3Bucket_Web_routingRules (79.46s)
--- PASS: TestAccS3Bucket_Web_simple (99.90s)

--- PASS: TestBucketName (0.00s)
--- PASS: TestBucketRegionalDomainName (0.00s)
--- PASS: TestWebsiteEndpoint (0.00s)
--- SKIP: TestAccS3BucketReplicationConfiguration_existingObjectReplication (0.00s)

@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/L Managed by automation to categorize the size of a PR. labels Jan 16, 2022
anGie44 added a commit that referenced this pull request Jan 16, 2022
@anGie44
Update CHANGELOG for #22612
e661082
@anGie44 anGie44 added the breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. label Jan 16, 2022
@anGie44 anGie44 changed the base branch from main to release/4.x January 16, 2022 03:39
@anGie44 anGie44 force-pushed the release/4.x branch 3 times, most recently from 1e894e8 to 6623846 Compare January 21, 2022 16:39
@anGie44 anGie44 force-pushed the release/4.x branch 2 times, most recently from 44a00a8 to 5ac8e8c Compare January 26, 2022 18:37
anGie44 added a commit that referenced this pull request Jan 26, 2022
@anGie44
Update CHANGELOG for #22612
53db820
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from e661082 to 53db820 Compare January 26, 2022 22:14
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 1d765bf to 2a9a565 Compare January 27, 2022 04:15
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 2a9a565 to 28a1356 Compare January 27, 2022 04:29
@github-actions github-actions bot added service/cloudsearch Issues and PRs that pertain to the cloudsearch service. service/connect Issues and PRs that pertain to the connect service. labels Jan 27, 2022
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 28a1356 to 224b503 Compare January 27, 2022 04:32
@github-actions github-actions bot removed service/connect Issues and PRs that pertain to the connect service. service/cloudsearch Issues and PRs that pertain to the cloudsearch service. labels Jan 27, 2022
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 224b503 to e380715 Compare January 27, 2022 04:42
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from e380715 to 325c24c Compare January 27, 2022 04:44
anGie44
anGie44 commented Jan 27, 2022
View reviewed changes
internal/service/s3/bucket_test.go Outdated
@@ -2507,7 +2507,7 @@ func TestAccS3Bucket_Replication_RTC_valid(t *testing.T) {

func TestAccS3Bucket_Manage_objectLock(t *testing.T) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tests with configurable object lock configuration arguments have been ported over to #22644

@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from d6e1a23 to ae80445 Compare February 3, 2022 18:49
anGie44 added a commit that referenced this pull request Feb 3, 2022
@anGie44
Update CHANGELOG for #22612
a22e184
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from ae80445 to b9469a3 Compare February 3, 2022 22:44
anGie44 added a commit that referenced this pull request Feb 5, 2022
@anGie44
Update CHANGELOG for #22612
504ed3d
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from e7f5aea to c3da9e1 Compare February 5, 2022 03:06
@anGie44
Copy link
Contributor Author

anGie44 commented Feb 5, 2022

Output of additional tests:

--- PASS: TestAccS3BucketObjectLockConfiguration_disappears (31.86s)
--- PASS: TestAccS3BucketObjectLockConfiguration_basic (33.79s)
--- PASS: TestAccS3BucketObjectLockConfiguration_update (57.24s)

@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch 2 times, most recently from 2672e92 to 33fe463 Compare February 7, 2022 04:18
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 33fe463 to d040aa3 Compare February 7, 2022 05:38
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from d040aa3 to 3d7a905 Compare February 7, 2022 05:39
@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 7, 2022
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 09cebe8 to 261570f Compare February 7, 2022 07:12
@anGie44 anGie44 force-pushed the f-s3-bucket-deprecate-object-lock-config branch from 261570f to fe9084c Compare February 7, 2022 07:14
@anGie44 anGie44 merged commit 574beff into main Feb 7, 2022
@anGie44 anGie44 deleted the f-s3-bucket-deprecate-object-lock-config branch February 7, 2022 07:26
github-actions bot pushed a commit that referenced this pull request Feb 7, 2022
Update CHANGELOG.md for #22612
d81c567
@github-actions
Copy link

This functionality has been released in v4.0.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 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@YakDriver YakDriver YakDriver approved these changes

Assignees

@YakDriver YakDriver

Labels
breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. documentation Introduces or discusses updates to documentation. 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
Milestone
v4.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@anGie44 @YakDriver @ewbankkit