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

resource/aws_s3_object: Don't set KMS Key ID if it matches the bucket… #10557

Closed
wants to merge 1 commit into from
Closed

resource/aws_s3_object: Don't set KMS Key ID if it matches the bucket… #10557

wants to merge 1 commit into from

Conversation

mattburgess
Copy link
Collaborator

@mattburgess mattburgess commented Oct 19, 2019 •
edited
Loading

…'s default encryption key (#10200)

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" comments, they generate extra noise for pull request followers and do not help prioritize the request

Relates OR Closes #10200

Release note for CHANGELOG:

resource/aws_s3_object: Don't set KMS Key ID if it matches the bucket's default encryption key (#10200)

Output from acceptance testing:

--- PASS: TestAccAWSS3BucketObject_noNameNoKey (4.51s)
--- PASS: TestAccAWSS3BucketObject_content (40.73s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_sse (40.95s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (40.96s)
--- PASS: TestAccAWSS3BucketObject_sse (41.03s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithAWSKey (43.09s)
--- PASS: TestAccAWSS3BucketObject_source (42.85s)
--- PASS: TestAccAWSS3BucketObject_kms (60.31s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithCMK (61.14s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (65.63s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (66.27s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (66.40s)
--- PASS: TestAccAWSS3BucketObject_updates (66.56s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (30.39s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (31.04s)
--- PASS: TestAccAWSS3BucketObject_empty (30.92s)
--- PASS: TestAccAWSS3BucketObject_metadata (77.94s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (80.74s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (81.24s)
--- PASS: TestAccAWSS3BucketObject_acl (84.77s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (94.52s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (95.36s)
--- PASS: TestAccAWSS3BucketObject_tags (100.04--- PASS: TestAccAWSS3BucketObject_noNameNoKey (4.51s)
--- PASS: TestAccAWSS3BucketObject_content (40.73s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_sse (40.95s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (40.96s)
--- PASS: TestAccAWSS3BucketObject_sse (41.03s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithAWSKey (43.09s)
--- PASS: TestAccAWSS3BucketObject_source (42.85s)
--- PASS: TestAccAWSS3BucketObject_kms (60.31s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithCMK (61.14s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (65.63s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (66.27s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (66.40s)
--- PASS: TestAccAWSS3BucketObject_updates (66.56s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (30.39s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (31.04s)
--- PASS: TestAccAWSS3BucketObject_empty (30.92s)
--- PASS: TestAccAWSS3BucketObject_metadata (77.94s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (80.74s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (81.24s)
--- PASS: TestAccAWSS3BucketObject_acl (84.77s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (94.52s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (95.36s)
--- PASS: TestAccAWSS3BucketObject_tags (100.04s)
--- PASS: TestAccAWSS3BucketObject_storageClass (118.36s)

@mattburgess
resource/aws_s3_object: Don't set KMS Key ID if it matches the bucket…
f62a19c 
…'s default encryption key (hashicorp#10200)

Output from acceptance testing:

```
--- PASS: TestAccAWSS3BucketObject_noNameNoKey (4.51s)
--- PASS: TestAccAWSS3BucketObject_content (40.73s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_sse (40.95s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (40.96s)
--- PASS: TestAccAWSS3BucketObject_sse (41.03s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithAWSKey (43.09s)
--- PASS: TestAccAWSS3BucketObject_source (42.85s)
--- PASS: TestAccAWSS3BucketObject_kms (60.31s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithCMK (61.14s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (65.63s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (66.27s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (66.40s)
--- PASS: TestAccAWSS3BucketObject_updates (66.56s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (30.39s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (31.04s)
--- PASS: TestAccAWSS3BucketObject_empty (30.92s)
--- PASS: TestAccAWSS3BucketObject_metadata (77.94s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (80.74s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (81.24s)
--- PASS: TestAccAWSS3BucketObject_acl (84.77s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (94.52s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (95.36s)
--- PASS: TestAccAWSS3BucketObject_tags (100.04--- PASS: TestAccAWSS3BucketObject_noNameNoKey (4.51s)
--- PASS: TestAccAWSS3BucketObject_content (40.73s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_sse (40.95s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (40.96s)
--- PASS: TestAccAWSS3BucketObject_sse (41.03s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithAWSKey (43.09s)
--- PASS: TestAccAWSS3BucketObject_source (42.85s)
--- PASS: TestAccAWSS3BucketObject_kms (60.31s)
--- PASS: TestAccAWSS3BucketObject_BucketDefaultEnc_kmsWithCMK (61.14s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (65.63s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (66.27s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (66.40s)
--- PASS: TestAccAWSS3BucketObject_updates (66.56s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (30.39s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (31.04s)
--- PASS: TestAccAWSS3BucketObject_empty (30.92s)
--- PASS: TestAccAWSS3BucketObject_metadata (77.94s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (80.74s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (81.24s)
--- PASS: TestAccAWSS3BucketObject_acl (84.77s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (94.52s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (95.36s)
--- PASS: TestAccAWSS3BucketObject_tags (100.04s)
--- PASS: TestAccAWSS3BucketObject_storageClass (118.36s)
```
@mattburgess mattburgess requested a review from a team October 19, 2019 13:45
@ghost ghost added size/L 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 Oct 19, 2019
@mattburgess
Copy link
Collaborator Author

This didn't fix the bug in the correct way; #15234 does that.

@mattburgess mattburgess deleted the fix-s3-object-encryption branch September 19, 2020 22:53
@ghost
Copy link

ghost commented Oct 20, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked as resolved and limited conversation to collaborators Oct 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
service/s3 Issues and PRs that pertain to the s3 service. size/L 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
No milestone
Development

Successfully merging this pull request may close these issues.

aws_s3_bucket_object changing object encryption if no encryption set
1 participant
@mattburgess