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_server_side_encryption_configuration: new resource #22609

Merged
merged 8 commits into from
Feb 3, 2022
Merged

r/s3_bucket_server_side_encryption_configuration: new resource #22609

merged 8 commits into from
Feb 3, 2022

Conversation

anGie44
Copy link
Contributor

@anGie44 anGie44 commented Jan 16, 2022 •
edited

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: TestAccS3BucketServerSideEncryptionConfiguration_ApplySEEByDefault_AES256 (102.06s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_BucketKeyEnabled (193.92s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMS (102.53s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSWithMasterKeyArn (102.83s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSWithMasterKeyID (102.84s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_UpdateSSEAlgorithm (190.04s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_BucketKeyEnabled (192.82s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_basic (102.39s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_disappears (87.60s)

--- PASS: TestAccS3Bucket_Basic_acceleration (169.08s)
--- PASS: TestAccS3Bucket_Basic_basic (93.16s)
--- PASS: TestAccS3Bucket_Basic_emptyString (97.47s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (83.03s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (78.26s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (79.29s)
--- PASS: TestAccS3Bucket_Basic_generatedName (95.13s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (102.68s)
--- PASS: TestAccS3Bucket_Basic_namePrefix (93.15s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (168.94s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (73.70s)
--- PASS: TestAccS3Bucket_Manage_MfaDeleteDisabled (99.19s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (222.12s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (173.53s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (103.76s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (91.62s)
--- PASS: TestAccS3Bucket_Manage_objectLock (116.30s)
--- PASS: TestAccS3Bucket_Manage_versioning (189.58s)
--- PASS: TestAccS3Bucket_Manage_versioningAndMfaDeleteDisabled (100.49s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (102.20s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (199.95s)
--- PASS: TestAccS3Bucket_Replication_basic (271.29s)
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (75.48s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (156.95s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (157.31s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (193.09s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (189.56s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (256.42s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (97.87s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (156.47s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (138.08s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (147.58s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (156.06s)
--- PASS: TestAccS3Bucket_Security_corsDelete (89.18s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (101.01s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (178.10s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (172.10s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (100.06s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (102.70s)
--- PASS: TestAccS3Bucket_Security_grantToACL (158.53s)
--- PASS: TestAccS3Bucket_Security_logging (105.43s)
--- PASS: TestAccS3Bucket_Security_policy (235.03s)
--- PASS: TestAccS3Bucket_Security_updateACL (168.65s)
--- PASS: TestAccS3Bucket_Security_updateGrant (246.05s)
--- PASS: TestAccS3Bucket_Tags_basic (98.89s)
--- PASS: TestAccS3Bucket_Tags_ignoreTags (153.04s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (307.25s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (359.56s)
--- PASS: TestAccS3Bucket_Web_redirect (245.22s)
--- PASS: TestAccS3Bucket_Web_routingRules (173.55s)
--- PASS: TestAccS3Bucket_Web_simple (246.20s)

@anGie44 anGie44 marked this pull request as draft January 16, 2022 01:07
@anGie44 anGie44 changed the base branch from main to release/4.x January 16, 2022 01:07
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/XL Managed by automation to categorize the size of a PR. and removed documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/s3 Issues and PRs that pertain to the s3 service. provider Pertains to the provider itself, rather than any interaction with AWS. labels Jan 16, 2022
anGie44 added a commit that referenced this pull request Jan 16, 2022
@anGie44
Update CHANGELOG for #22609
d8ed69d
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 16, 2022
@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 #22609
03160b9
@anGie44 anGie44 mentioned this pull request Jan 26, 2022
Merged
@anGie44 anGie44 marked this pull request as ready for review January 27, 2022 00:47
@anGie44 anGie44 added the new-resource Introduces a new resource. label Jan 27, 2022
@anGie44 anGie44 force-pushed the release/4.x branch 3 times, most recently from 13942a7 to e604544 Compare January 28, 2022 22:15
@github-actions github-actions bot removed the provider Pertains to the provider itself, rather than any interaction with AWS. label Jan 29, 2022
Base automatically changed from release/4.x to main January 31, 2022 22:56
anGie44 added a commit that referenced this pull request Feb 1, 2022
@anGie44
Update CHANGELOG for #22609
66c0f66
@ewbankkit ewbankkit added this to the v4.0.0 milestone Feb 2, 2022
anGie44 added a commit that referenced this pull request Feb 3, 2022
@anGie44
Update CHANGELOG for #22609
1f94283
@github-actions github-actions bot added the provider Pertains to the provider itself, rather than any interaction with AWS. label Feb 3, 2022
anGie44 added a commit that referenced this pull request Feb 3, 2022
@anGie44
Update CHANGELOG for #22609
753abd3
@YakDriver YakDriver self-assigned this Feb 3, 2022
YakDriver
YakDriver approved these changes Feb 3, 2022
View reviewed changes
Copy link
Member

@YakDriver YakDriver left a comment

Choose a reason for hiding this comment

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

Needs conflict work but otherwise LGTM! 🎉

% make testacc TESTS=TestAccS3BucketServerSideEncryptionConfiguration_ PKG=s3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketServerSideEncryptionConfiguration_'  -timeout 180m
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_disappears (34.56s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_basic (38.75s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMS (38.80s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySEEByDefault_AES256 (38.81s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSWithMasterKeyID (38.92s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSWithMasterKeyArn (38.98s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_UpdateSSEAlgorithm (65.16s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_BucketKeyEnabled (65.23s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_BucketKeyEnabled (65.38s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	66.970s
% 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_Security_corsDelete (45.39s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (45.39s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (46.81s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (47.11s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (50.81s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (52.68s)
--- PASS: TestAccS3Bucket_Basic_basic (53.03s)
--- PASS: TestAccS3Bucket_Manage_MfaDeleteDisabled (54.30s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (56.14s)
--- PASS: TestAccS3Bucket_Manage_versioningAndMfaDeleteDisabled (56.77s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (56.78s)
--- PASS: TestAccS3Bucket_Security_logging (62.92s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (64.87s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (64.97s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (26.52s)
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (20.28s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (76.32s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (94.71s)
--- PASS: TestAccS3Bucket_Manage_objectLock (94.79s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (94.79s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (45.82s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (52.47s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (65.34s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (65.29s)
--- PASS: TestAccS3Bucket_Basic_generatedName (47.21s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (51.83s)
--- PASS: TestAccS3Bucket_Security_grantToACL (77.88s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (137.21s)
--- PASS: TestAccS3Bucket_Web_routingRules (94.90s)
--- PASS: TestAccS3Bucket_Manage_versioning (96.89s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (88.18s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (68.63s)
--- PASS: TestAccS3Bucket_Basic_namePrefix (46.88s)
--- PASS: TestAccS3Bucket_Web_redirect (130.52s)
--- PASS: TestAccS3Bucket_Web_simple (129.76s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (115.27s)
--- PASS: TestAccS3Bucket_Tags_ignoreTags (54.85s)
--- PASS: TestAccS3Bucket_Basic_emptyString (47.38s)
--- PASS: TestAccS3Bucket_Tags_basic (48.66s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (62.67s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (84.39s)
--- PASS: TestAccS3Bucket_Security_updateACL (81.20s)
--- PASS: TestAccS3Bucket_Basic_acceleration (81.91s)
--- PASS: TestAccS3Bucket_Replication_basic (205.66s)
--- PASS: TestAccS3Bucket_Security_policy (118.69s)
--- PASS: TestAccS3Bucket_Security_updateGrant (126.69s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (101.41s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (182.67s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (132.98s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (225.12s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (174.09s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	326.973s

anGie44 added a commit that referenced this pull request Feb 3, 2022
@anGie44
Update CHANGELOG for #22609
4bc1695
@anGie44 anGie44 merged commit 2c9704f into main Feb 3, 2022
@anGie44 anGie44 deleted the f-s3-bucket-sse-resource branch February 3, 2022 19:32
github-actions bot pushed a commit that referenced this pull request Feb 3, 2022
Update CHANGELOG.md for #22609
49748fb
@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
documentation Introduces or discusses updates to documentation. new-resource Introduces a new resource. provider Pertains to the provider itself, rather than any interaction with AWS. 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.

None yet
3 participants
@anGie44 @YakDriver @ewbankkit