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_bucket: Remove automatic aws_s3_bucket_policy import #14121

Merged
merged 2 commits into from Jul 13, 2020
Merged

resource/aws_s3_bucket: Remove automatic aws_s3_bucket_policy import #14121

merged 2 commits into from Jul 13, 2020

Conversation

bflad
Copy link
Member

@bflad bflad commented Jul 9, 2020 •
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

Closes #394
Closes #9001
Closes #9508
Closes #12805
Reference: #13408

Release note for CHANGELOG:

* resource/aws_s3_bucket: Remove automatic `aws_s3_bucket_policy` resource import

Output from acceptance testing:

--- PASS: TestAccAWSS3Bucket_acceleration (70.53s)
--- PASS: TestAccAWSS3Bucket_AclToGrant (64.37s)
--- PASS: TestAccAWSS3Bucket_basic (37.90s)
--- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (39.08s)
--- PASS: TestAccAWSS3Bucket_Cors_Delete (32.28s)
--- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (39.25s)
--- PASS: TestAccAWSS3Bucket_Cors_Update (68.80s)
--- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (67.23s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (37.19s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (44.32s)
--- PASS: TestAccAWSS3Bucket_forceDestroy (37.21s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (38.50s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (37.77s)
--- PASS: TestAccAWSS3Bucket_generatedName (38.80s)
--- PASS: TestAccAWSS3Bucket_GrantToAcl (60.31s)
--- PASS: TestAccAWSS3Bucket_LifecycleBasic (89.67s)
--- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (67.52s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (30.08s)
--- PASS: TestAccAWSS3Bucket_Logging (56.73s)
--- PASS: TestAccAWSS3Bucket_namePrefix (40.92s)
--- PASS: TestAccAWSS3Bucket_objectLock (68.34s)
--- PASS: TestAccAWSS3Bucket_Policy (97.07s)
--- PASS: TestAccAWSS3Bucket_region (34.45s)
--- PASS: TestAccAWSS3Bucket_Replication (159.22s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (94.18s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (95.79s)
--- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (28.62s)
--- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (167.50s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (55.52s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (58.02s)
--- PASS: TestAccAWSS3Bucket_RequestPayer (67.28s)
--- PASS: TestAccAWSS3Bucket_shouldFailNotFound (19.65s)
--- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (119.32s)
--- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (171.42s)
--- PASS: TestAccAWSS3Bucket_UpdateAcl (65.51s)
--- PASS: TestAccAWSS3Bucket_UpdateGrant (92.38s)
--- PASS: TestAccAWSS3Bucket_Versioning (95.55s)
--- PASS: TestAccAWSS3Bucket_Website_Simple (95.12s)
--- PASS: TestAccAWSS3Bucket_WebsiteRedirect (91.21s)
--- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (65.48s)

@bflad
resource/aws_s3_bucket: Remove automatic aws_s3_bucket_policy import
2dd5d9b 
Reference: #394
Reference: #9001
Reference: #9508
Reference: #12805

Output from acceptance testing:

```
--- PASS: TestAccAWSS3Bucket_acceleration (70.53s)
--- PASS: TestAccAWSS3Bucket_AclToGrant (64.37s)
--- PASS: TestAccAWSS3Bucket_basic (37.90s)
--- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (39.08s)
--- PASS: TestAccAWSS3Bucket_Cors_Delete (32.28s)
--- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (39.25s)
--- PASS: TestAccAWSS3Bucket_Cors_Update (68.80s)
--- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (67.23s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (37.19s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (44.32s)
--- PASS: TestAccAWSS3Bucket_forceDestroy (37.21s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (38.50s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (37.77s)
--- PASS: TestAccAWSS3Bucket_generatedName (38.80s)
--- PASS: TestAccAWSS3Bucket_GrantToAcl (60.31s)
--- PASS: TestAccAWSS3Bucket_LifecycleBasic (89.67s)
--- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (67.52s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (30.08s)
--- PASS: TestAccAWSS3Bucket_Logging (56.73s)
--- PASS: TestAccAWSS3Bucket_namePrefix (40.92s)
--- PASS: TestAccAWSS3Bucket_objectLock (68.34s)
--- PASS: TestAccAWSS3Bucket_Policy (97.07s)
--- PASS: TestAccAWSS3Bucket_region (34.45s)
--- PASS: TestAccAWSS3Bucket_Replication (159.22s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (94.18s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (95.79s)
--- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (28.62s)
--- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (167.50s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (55.52s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (58.02s)
--- PASS: TestAccAWSS3Bucket_RequestPayer (67.28s)
--- PASS: TestAccAWSS3Bucket_shouldFailNotFound (19.65s)
--- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (119.32s)
--- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (171.42s)
--- PASS: TestAccAWSS3Bucket_UpdateAcl (65.51s)
--- PASS: TestAccAWSS3Bucket_UpdateGrant (92.38s)
--- PASS: TestAccAWSS3Bucket_Versioning (95.55s)
--- PASS: TestAccAWSS3Bucket_Website_Simple (95.12s)
--- PASS: TestAccAWSS3Bucket_WebsiteRedirect (91.21s)
--- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (65.48s)
```
@bflad bflad added breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. technical-debt Addresses areas of the codebase that need refactoring or redesign. labels Jul 9, 2020
@bflad bflad added this to the v3.0.0 milestone Jul 9, 2020
@bflad bflad requested a review from a team July 9, 2020 20:19
@ghost ghost added size/M Managed by automation to categorize the size of a PR. 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. labels Jul 9, 2020
anGie44
anGie44 approved these changes Jul 10, 2020
View reviewed changes
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Looks great 👍

Output of acceptance tests:

--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (103.28s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (660.19s)
--- PASS: TestAccAWSS3Bucket_basic (23.04s)
--- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (22.70s)
--- PASS: TestAccAWSS3Bucket_generatedName (21.89s)
--- PASS: TestAccAWSS3Bucket_namePrefix (23.44s)
--- PASS: TestAccAWSS3Bucket_region (21.69s)
--- PASS: TestAccAWSS3Bucket_shouldFailNotFound (14.81s)
--- PASS: TestAccAWSS3Bucket_RequestPayer (35.10s)
--- PASS: TestAccAWSS3Bucket_UpdateAcl (33.13s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (19.56s)
--- PASS: TestAccAWSS3Bucket_AclToGrant (32.99s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (23.42s)
--- PASS: TestAccAWSS3Bucket_acceleration (40.39s)
--- PASS: TestAccAWSS3Bucket_Cors_Delete (17.51s)
--- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (19.85s)
--- PASS: TestAccAWSS3Bucket_GrantToAcl (33.71s)
--- PASS: TestAccAWSS3Bucket_Policy (47.18s)
--- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (61.68s)
--- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (35.18s)
--- PASS: TestAccAWSS3Bucket_UpdateGrant (48.79s)
--- PASS: TestAccAWSS3Bucket_Cors_Update (33.88s)
--- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (37.17s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (18.84s)
--- PASS: TestAccAWSS3Bucket_Website_Simple (46.25s)
--- PASS: TestAccAWSS3Bucket_Logging (24.28s)
--- PASS: TestAccAWSS3Bucket_WebsiteRedirect (44.50s)
--- PASS: TestAccAWSS3Bucket_Versioning (43.86s)
--- PASS: TestAccAWSS3Bucket_forceDestroy (14.00s)
--- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (29.45s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (12.80s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (14.23s)
--- PASS: TestAccAWSS3Bucket_LifecycleBasic (36.24s)
--- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (31.69s)
--- PASS: TestAccAWSS3Bucket_objectLock (23.83s)
--- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (96.23s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (47.39s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (44.96s)
--- PASS: TestAccAWSS3Bucket_Replication (111.96s)
--- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (107.01s)

@bflad
Copy link
Member Author

bflad commented Jul 13, 2020

Rebased to fix upgrade guide merge conflict. 👍

@bflad bflad merged commit 05fc9c4 into master Jul 13, 2020
@bflad bflad deleted the td-aws_s3_bucket-policy-import branch July 13, 2020 17:50
bflad added a commit that referenced this pull request Jul 13, 2020
@bflad
Update CHANGELOG for #14121
1b08d17
@ghost
Copy link

ghost commented Jul 31, 2020

This has been released in version 3.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 for triage. Thanks!

@ghost
Copy link

ghost commented Aug 13, 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!

@hashicorp hashicorp locked and limited conversation to collaborators Aug 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@anGie44 anGie44 anGie44 approved these changes

Assignees
No one assigned
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/M Managed by automation to categorize the size of a PR. technical-debt Addresses areas of the codebase that need refactoring or redesign. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v3.0.0
2 participants
@bflad @anGie44