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.

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

resource/s3_bucket: check for additional rule action before adding default expiration setting #15263

Merged
merged 1 commit into from
Oct 8, 2020

Conversation

anGie44
Copy link
Contributor

@anGie44 anGie44 commented Sep 22, 2020

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 #15138
Closes #14280

Release note for CHANGELOG:

resource/s3_bucket: correctly set expiration for lifecycle_rule with abort_incomplete_multipart_upload_days set

Output from acceptance testing:

--- PASS: TestAccAWSS3Bucket_LifecycleRule_AbortIncompleteMultipartUploadDays_NoExpiration (37.35s)

@anGie44 anGie44 requested a review from a team September 22, 2020 03:23
@ghost ghost added size/S 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 Sep 22, 2020
@anGie44 anGie44 added the bug Addresses a defect in current functionality. label Sep 22, 2020
@anGie44 anGie44 force-pushed the b-s3-bucket-lifecycle-expiration branch from 766fdf9 to a412c4e Compare September 22, 2020 03:33
@gdavison gdavison self-assigned this Oct 8, 2020
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

--- PASS: TestAccAWSS3BucketMetric_WithEmptyFilter (8.78s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Empty (8.17s)
--- FAIL: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Empty (8.74s)
--- PASS: TestAccAWSS3BucketMetric_basic (72.49s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_basic (74.29s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Default (76.64s)
--- PASS: TestAccAWSS3BucketInventory_basic (76.85s)
--- PASS: TestAccAWSS3BucketInventory_encryptWithSSEKMS (79.69s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Full (80.65s)
--- PASS: TestAccAWSS3BucketInventory_encryptWithSSES3 (90.03s)
--- PASS: TestAccAWSS3BucketObject_noNameNoKey (13.21s)
--- PASS: TestAccAWSS3BucketNotification_LambdaFunction (97.88s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_removed (120.96s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterPrefix (132.68s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_SingleTag (133.73s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterPrefixAndMultipleTags (134.48s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_MultipleTags (133.90s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_PrefixAndTags (135.03s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Remove (136.16s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Prefix (136.00s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterPrefixAndSingleTag (138.25s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterSingleTag (136.79s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterMultipleTags (143.61s)
--- PASS: TestAccAWSS3BucketObject_empty (66.26s)
--- PASS: TestAccAWSS3BucketNotification_Queue (82.91s)
--- PASS: TestAccAWSS3BucketNotification_Topic_Multiple (81.90s)
--- PASS: TestAccAWSS3BucketObject_source (66.41s)
--- PASS: TestAccAWSS3BucketNotification_Topic (83.42s)
--- PASS: TestAccAWSS3BucketObject_content (63.75s)
--- PASS: TestAccAWSS3BucketNotification_LambdaFunction_LambdaFunctionArn_Alias (103.27s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (67.40s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_updateBasic (192.45s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (65.72s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (66.92s)
--- PASS: TestAccAWSS3BucketObject_NonVersioned (67.15s)
--- PASS: TestAccAWSS3BucketNotification_update (131.27s)
--- PASS: TestAccAWSS3BucketObject_sse (67.28s)
--- PASS: TestAccAWSS3BucketObject_kms (80.20s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (125.11s)
--- PASS: TestAccAWSS3BucketObject_defaultBucketSSE (67.96s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioningViaAccessPoint (126.19s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (127.57s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_bucketDisappears (51.80s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_disappears (62.58s)
--- PASS: TestAccAWSS3BucketObject_updates (142.54s)
--- PASS: TestAccAWSS3BucketPolicy_basic (80.76s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (129.58s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_basic (108.71s)
--- PASS: TestAccAWSS3BucketObject_ignoreTags (128.53s)
--- PASS: TestAccAWSS3BucketObject_acl (175.73s)
--- PASS: TestAccAWSS3BucketPolicy_policyUpdate (133.76s)
--- PASS: TestAccAWSS3BucketObject_metadata (181.94s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (180.43s)
--- PASS: TestAccAWSS3Bucket_basic (72.23s)
--- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (75.85s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (216.11s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (240.93s)
--- PASS: TestAccAWSS3MultiBucket_withTags (81.80s)
--- PASS: TestAccAWSS3Bucket_namePrefix (74.88s)
--- PASS: TestAccAWSS3BucketObject_tags (243.88s)
--- PASS: TestAccAWSS3Bucket_generatedName (80.36s)
--- PASS: TestAccAWSS3Bucket_ignoreTags (124.23s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (239.57s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_BlockPublicPolicy (190.27s)
--- PASS: TestAccAWSS3BucketObject_storageClass (298.68s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_RestrictPublicBuckets (193.76s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_BlockPublicAcls (198.69s)
--- FAIL: TestAccAWSS3Bucket_UpdateGrant (108.59s)
--- PASS: TestAccAWSS3Bucket_acceleration (138.28s)
--- PASS: TestAccAWSS3Bucket_RequestPayer (136.67s)
--- PASS: TestAccAWSS3Bucket_UpdateAcl (136.50s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (77.84s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_IgnorePublicAcls (229.41s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (76.42s)
--- PASS: TestAccAWSS3Bucket_shouldFailNotFound (52.96s)
--- PASS: TestAccAWSS3Bucket_AclToGrant (125.05s)
--- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (251.13s)
--- PASS: TestAccAWSS3Bucket_Cors_Delete (71.68s)
--- PASS: TestAccAWSS3Bucket_GrantToAcl (134.51s)
--- PASS: TestAccAWSS3Bucket_Policy (197.00s)
--- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (81.36s)
--- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (139.97s)
--- PASS: TestAccAWSS3Bucket_Logging (80.23s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (67.90s)
--- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (140.91s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_AbortIncompleteMultipartUploadDays_NoExpiration (80.25s)
--- PASS: TestAWSS3BucketName (0.00s)
--- PASS: TestBucketRegionalDomainName (0.00s)
--- PASS: TestWebsiteEndpoint (0.02s)
--- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (307.65s)
--- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (61.57s)
--- PASS: TestAccAWSS3Bucket_WebsiteRedirect (194.87s)
--- PASS: TestAccAWSS3Bucket_Cors_Update (140.29s)
--- PASS: TestAccAWSS3Bucket_Website_Simple (195.84s)
--- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (131.40s)
--- PASS: TestAccAWSS3Bucket_SameRegionReplicationSchemaV2 (74.74s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (66.15s)
--- PASS: TestAccAWSS3Bucket_forceDestroy (67.34s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (54.29s)
--- FAIL: TestAccAWSS3Bucket_LifecycleBasic (155.35s)
--- PASS: TestAccAWSS3Bucket_Versioning (177.09s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (105.39s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (101.69s)
--- PASS: TestAccAWSS3Bucket_objectLock (95.41s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (140.15s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (154.13s)
--- PASS: TestAccAWSS3Bucket_Replication (201.32s)
--- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (175.02s)

All test failures are pre-existing on main branch

@gdavison gdavison added this to the v3.10.0 milestone Oct 8, 2020
@gdavison gdavison merged commit cb4033d into master Oct 8, 2020
@gdavison gdavison deleted the b-s3-bucket-lifecycle-expiration branch October 8, 2020 19:25
gdavison added a commit that referenced this pull request Oct 8, 2020
@ghost
Copy link

ghost commented Oct 9, 2020

This has been released in version 3.10.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 Nov 8, 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 Nov 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/s3 Issues and PRs that pertain to the s3 service. size/S 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
Development

Successfully merging this pull request may close these issues.

aws_s3_bucket perpetual diff in lifecycle_rule expiration block
2 participants