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/aws_s3_bucket_server_side_encryption_configuration: S3 directory buckets now support SSE-KMS #39366

Merged
merged 11 commits into from
Sep 18, 2024
Merged

r/aws_s3_bucket_server_side_encryption_configuration: S3 directory buckets now support SSE-KMS #39366

merged 11 commits into from
Sep 18, 2024
+107 −28

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Sep 17, 2024 •
edited
Loading

Description

S3 directory buckets now support SSE-KMS.

Relations

Closes #39365.

Output from Acceptance Testing

% make testacc TESTARGS='-run=_directoryBucket$$' PKG=s3 ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/s3/... -v -count 1 -parallel 3  -run=_directoryBucket$ -timeout 360m
=== RUN   TestAccS3BucketAccelerateConfiguration_directoryBucket
=== PAUSE TestAccS3BucketAccelerateConfiguration_directoryBucket
=== RUN   TestAccS3BucketACL_directoryBucket
=== PAUSE TestAccS3BucketACL_directoryBucket
=== RUN   TestAccS3BucketAnalyticsConfiguration_directoryBucket
=== PAUSE TestAccS3BucketAnalyticsConfiguration_directoryBucket
=== RUN   TestAccS3BucketCORSConfiguration_directoryBucket
=== PAUSE TestAccS3BucketCORSConfiguration_directoryBucket
=== RUN   TestAccS3BucketIntelligentTieringConfiguration_directoryBucket
=== PAUSE TestAccS3BucketIntelligentTieringConfiguration_directoryBucket
=== RUN   TestAccS3BucketInventory_directoryBucket
=== PAUSE TestAccS3BucketInventory_directoryBucket
=== RUN   TestAccS3BucketLifecycleConfiguration_directoryBucket
=== PAUSE TestAccS3BucketLifecycleConfiguration_directoryBucket
=== RUN   TestAccS3BucketLogging_directoryBucket
=== PAUSE TestAccS3BucketLogging_directoryBucket
=== RUN   TestAccS3BucketMetric_directoryBucket
=== PAUSE TestAccS3BucketMetric_directoryBucket
=== RUN   TestAccS3BucketNotification_directoryBucket
=== PAUSE TestAccS3BucketNotification_directoryBucket
=== RUN   TestAccS3BucketObjectLockConfiguration_directoryBucket
=== PAUSE TestAccS3BucketObjectLockConfiguration_directoryBucket
=== RUN   TestAccS3BucketOwnershipControls_directoryBucket
=== PAUSE TestAccS3BucketOwnershipControls_directoryBucket
=== RUN   TestAccS3BucketPolicy_directoryBucket
=== PAUSE TestAccS3BucketPolicy_directoryBucket
=== RUN   TestAccS3BucketPublicAccessBlock_directoryBucket
=== PAUSE TestAccS3BucketPublicAccessBlock_directoryBucket
=== RUN   TestAccS3BucketReplicationConfiguration_directoryBucket
=== PAUSE TestAccS3BucketReplicationConfiguration_directoryBucket
=== RUN   TestAccS3BucketRequestPaymentConfiguration_directoryBucket
=== PAUSE TestAccS3BucketRequestPaymentConfiguration_directoryBucket
=== RUN   TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
=== PAUSE TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
=== RUN   TestAccS3BucketVersioning_directoryBucket
=== PAUSE TestAccS3BucketVersioning_directoryBucket
=== RUN   TestAccS3BucketWebsiteConfiguration_directoryBucket
=== PAUSE TestAccS3BucketWebsiteConfiguration_directoryBucket
=== RUN   TestAccS3ObjectCopy_directoryBucket
=== PAUSE TestAccS3ObjectCopy_directoryBucket
=== RUN   TestAccS3ObjectDataSource_directoryBucket
=== PAUSE TestAccS3ObjectDataSource_directoryBucket
=== RUN   TestAccS3Object_directoryBucket
=== PAUSE TestAccS3Object_directoryBucket
=== RUN   TestAccS3ObjectsDataSource_directoryBucket
=== PAUSE TestAccS3ObjectsDataSource_directoryBucket
=== CONT  TestAccS3BucketAccelerateConfiguration_directoryBucket
=== CONT  TestAccS3BucketPolicy_directoryBucket
=== CONT  TestAccS3BucketLifecycleConfiguration_directoryBucket
--- PASS: TestAccS3BucketLifecycleConfiguration_directoryBucket (8.84s)
=== CONT  TestAccS3BucketOwnershipControls_directoryBucket
--- PASS: TestAccS3BucketAccelerateConfiguration_directoryBucket (8.87s)
=== CONT  TestAccS3BucketObjectLockConfiguration_directoryBucket
--- PASS: TestAccS3BucketPolicy_directoryBucket (15.27s)
=== CONT  TestAccS3BucketNotification_directoryBucket
--- PASS: TestAccS3BucketOwnershipControls_directoryBucket (8.28s)
=== CONT  TestAccS3BucketMetric_directoryBucket
--- PASS: TestAccS3BucketObjectLockConfiguration_directoryBucket (8.58s)
=== CONT  TestAccS3BucketLogging_directoryBucket
--- PASS: TestAccS3BucketNotification_directoryBucket (8.22s)
=== CONT  TestAccS3BucketCORSConfiguration_directoryBucket
--- PASS: TestAccS3BucketMetric_directoryBucket (8.13s)
=== CONT  TestAccS3BucketInventory_directoryBucket
--- PASS: TestAccS3BucketLogging_directoryBucket (13.24s)
=== CONT  TestAccS3BucketIntelligentTieringConfiguration_directoryBucket
--- PASS: TestAccS3BucketCORSConfiguration_directoryBucket (8.26s)
=== CONT  TestAccS3BucketAnalyticsConfiguration_directoryBucket
--- PASS: TestAccS3BucketInventory_directoryBucket (8.17s)
=== CONT  TestAccS3BucketACL_directoryBucket
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_directoryBucket (8.40s)
=== CONT  TestAccS3BucketWebsiteConfiguration_directoryBucket
--- PASS: TestAccS3BucketAnalyticsConfiguration_directoryBucket (8.31s)
=== CONT  TestAccS3ObjectsDataSource_directoryBucket
--- PASS: TestAccS3BucketACL_directoryBucket (8.13s)
=== CONT  TestAccS3Object_directoryBucket
--- PASS: TestAccS3BucketWebsiteConfiguration_directoryBucket (8.01s)
=== CONT  TestAccS3ObjectDataSource_directoryBucket
--- PASS: TestAccS3ObjectsDataSource_directoryBucket (15.09s)
=== CONT  TestAccS3ObjectCopy_directoryBucket
--- PASS: TestAccS3Object_directoryBucket (18.09s)
=== CONT  TestAccS3BucketVersioning_directoryBucket
--- PASS: TestAccS3ObjectDataSource_directoryBucket (15.02s)
=== CONT  TestAccS3BucketReplicationConfiguration_directoryBucket
--- PASS: TestAccS3BucketVersioning_directoryBucket (8.03s)
=== CONT  TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
--- PASS: TestAccS3ObjectCopy_directoryBucket (15.76s)
=== CONT  TestAccS3BucketPublicAccessBlock_directoryBucket
--- PASS: TestAccS3BucketReplicationConfiguration_directoryBucket (12.25s)
=== CONT  TestAccS3BucketRequestPaymentConfiguration_directoryBucket
--- PASS: TestAccS3BucketPublicAccessBlock_directoryBucket (8.37s)
--- PASS: TestAccS3BucketRequestPaymentConfiguration_directoryBucket (8.13s)
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket (18.06s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	90.958s
% make testacc TESTARGS='-run=TestAccS3Object_DirectoryBucket' PKG=s3 ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/s3/... -v -count 1 -parallel 3  -run=TestAccS3Object_DirectoryBucket -timeout 360m
=== RUN   TestAccS3Object_DirectoryBucket_disappears
=== PAUSE TestAccS3Object_DirectoryBucket_disappears
=== RUN   TestAccS3Object_DirectoryBucket_DefaultTags_providerOnly
=== PAUSE TestAccS3Object_DirectoryBucket_DefaultTags_providerOnly
=== RUN   TestAccS3Object_DirectoryBucket_kmsSSE
=== PAUSE TestAccS3Object_DirectoryBucket_kmsSSE
=== CONT  TestAccS3Object_DirectoryBucket_disappears
=== CONT  TestAccS3Object_DirectoryBucket_kmsSSE
=== CONT  TestAccS3Object_DirectoryBucket_DefaultTags_providerOnly
--- PASS: TestAccS3Object_DirectoryBucket_DefaultTags_providerOnly (13.91s)
--- PASS: TestAccS3Object_DirectoryBucket_disappears (16.19s)
--- PASS: TestAccS3Object_DirectoryBucket_kmsSSE (20.77s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	25.796s

@ewbankkit
r/aws_s3control_object_lambda_access_point: Fix 'InvalidParameterValu…
f20ecb9 
…eException: The runtime parameter of nodejs14.x is no longer supported for creating or updating AWS Lambda functions. We recommend you use a supported runtime while creating or updating functions' in acceptance tests.
@ewbankkit
r/aws_s3_account_public_access_block: Handle eventual consistency on …
f0daac6 
…Delete.
@ewbankkit
Fix 'TestAccS3BucketLifecycleConfiguration_directoryBucket'.
f3d4643
@ewbankkit
Fix 'TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket'.
9a0de0a
@ewbankkit
r/aws_s3_bucket_server_side_encryption_configuration: S3 Directory Bu…
98b4a1c 
…cket support.
@ewbankkit
Acceptance test output:
e512be9 
% make testacc TESTARGS='-run=TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket' PKG=s3 ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.0 test ./internal/service/s3/... -v -count 1 -parallel 3  -run=TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket -timeout 360m
=== RUN   TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
=== PAUSE TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
=== CONT  TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket (16.84s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	21.909s
@ewbankkit
Add CHANGELOG entry.
ca5ad34
@ewbankkit
Merge branch 'main' into f-veyron-sse-kms
fe089a3
@ewbankkit ewbankkit requested a review from a team as a code owner September 17, 2024 21:47
@github-actions GitHub Actions
Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added 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. service/s3control Issues and PRs that pertain to the s3control service. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. labels Sep 17, 2024
@ewbankkit ewbankkit added the enhancement Requests to existing resources that expand the functionality or scope. label Sep 17, 2024
jar-b
jar-b approved these changes Sep 18, 2024
View reviewed changes
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

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

LGTM 🎉

%  make testacc TESTARGS='-run=_directoryBucket$$' PKG=s3 ACCTEST_PARALLELISM=5
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/s3/... -v -count 1 -parallel 5  -run=_directoryBucket$ -timeout 360m

--- PASS: TestAccS3BucketLifecycleConfiguration_directoryBucket (9.98s)
=== CONT  TestAccS3BucketACL_directoryBucket
--- PASS: TestAccS3BucketAnalyticsConfiguration_directoryBucket (10.11s)
=== CONT  TestAccS3BucketInventory_directoryBucket
--- PASS: TestAccS3BucketCORSConfiguration_directoryBucket (10.22s)
=== CONT  TestAccS3BucketWebsiteConfiguration_directoryBucket
--- PASS: TestAccS3BucketAccelerateConfiguration_directoryBucket (10.24s)
=== CONT  TestAccS3ObjectsDataSource_directoryBucket
--- PASS: TestAccS3BucketPolicy_directoryBucket (17.13s)
=== CONT  TestAccS3Object_directoryBucket
--- PASS: TestAccS3BucketACL_directoryBucket (9.15s)
=== CONT  TestAccS3ObjectDataSource_directoryBucket
--- PASS: TestAccS3BucketInventory_directoryBucket (9.50s)
=== CONT  TestAccS3ObjectCopy_directoryBucket
--- PASS: TestAccS3BucketWebsiteConfiguration_directoryBucket (9.43s)
=== CONT  TestAccS3BucketRequestPaymentConfiguration_directoryBucket
--- PASS: TestAccS3ObjectsDataSource_directoryBucket (16.83s)
=== CONT  TestAccS3BucketVersioning_directoryBucket
--- PASS: TestAccS3BucketRequestPaymentConfiguration_directoryBucket (9.17s)
=== CONT  TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket
--- PASS: TestAccS3ObjectDataSource_directoryBucket (16.91s)
=== CONT  TestAccS3BucketReplicationConfiguration_directoryBucket
--- PASS: TestAccS3BucketVersioning_directoryBucket (9.21s)
=== CONT  TestAccS3BucketIntelligentTieringConfiguration_directoryBucket
--- PASS: TestAccS3ObjectCopy_directoryBucket (17.89s)
=== CONT  TestAccS3BucketNotification_directoryBucket
--- PASS: TestAccS3Object_directoryBucket (20.57s)
=== CONT  TestAccS3BucketOwnershipControls_directoryBucket
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_directoryBucket (8.55s)
=== CONT  TestAccS3BucketObjectLockConfiguration_directoryBucket
--- PASS: TestAccS3BucketNotification_directoryBucket (8.82s)
=== CONT  TestAccS3BucketMetric_directoryBucket
--- PASS: TestAccS3BucketOwnershipControls_directoryBucket (8.92s)
=== CONT  TestAccS3BucketLogging_directoryBucket
--- PASS: TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket (19.77s)
=== CONT  TestAccS3BucketPublicAccessBlock_directoryBucket
--- PASS: TestAccS3BucketReplicationConfiguration_directoryBucket (13.87s)
--- PASS: TestAccS3BucketObjectLockConfiguration_directoryBucket (9.12s)
--- PASS: TestAccS3BucketMetric_directoryBucket (8.98s)
--- PASS: TestAccS3BucketPublicAccessBlock_directoryBucket (8.41s)
--- PASS: TestAccS3BucketLogging_directoryBucket (13.26s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/s3 66.133s

@ewbankkit ewbankkit merged commit 95ba1f0 into main Sep 18, 2024
47 checks passed
@ewbankkit ewbankkit deleted the f-veyron-sse-kms branch September 18, 2024 14:30
@github-actions github-actions bot added this to the v5.68.0 milestone Sep 18, 2024
@github-actions GitHub Actions
Copy link

This functionality has been released in v5.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 github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jar-b jar-b jar-b approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/s3control Issues and PRs that pertain to the s3control service. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.68.0
Development

Successfully merging this pull request may close these issues.

Amazon S3 Express One Zone now supports AWS-KMS with CMKs
2 participants
@ewbankkit @jar-b