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

s3/bucket: Guard against object lock error #22575

Merged
merged 3 commits into from
Jan 13, 2022

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Jan 13, 2022

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 #18593

Output from acceptance testing:

% 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_Replication_expectVersioningValidationError (24.03s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (39.07s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (41.00s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (42.00s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (44.75s)
--- PASS: TestAccS3Bucket_Basic_basic (48.99s)
--- PASS: TestAccS3Bucket_Manage_versioningAndMfaDeleteDisabled (49.07s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (49.32s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (61.82s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (65.81s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (66.12s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (68.93s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (69.34s)
--- PASS: TestAccS3Bucket_Security_corsDelete (35.04s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (42.99s)
--- PASS: TestAccS3Bucket_Security_logging (60.44s)
--- PASS: TestAccS3Bucket_Manage_objectLock (87.23s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (87.50s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (28.15s)
--- PASS: TestAccS3Bucket_Manage_MfaDeleteDisabled (48.01s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (63.03s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (46.61s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (115.99s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (45.92s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (53.45s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (125.86s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (84.24s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (77.50s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (49.97s)
--- PASS: TestAccS3Bucket_Basic_generatedName (40.87s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (80.28s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (110.55s)
--- PASS: TestAccS3Bucket_Manage_versioning (94.38s)
--- PASS: TestAccS3Bucket_Security_grantToACL (69.85s)
--- PASS: TestAccS3Bucket_Web_routingRules (80.25s)
--- PASS: TestAccS3Bucket_Basic_namePrefix (43.08s)
--- PASS: TestAccS3Bucket_Tags_basic (46.24s)
--- PASS: TestAccS3Bucket_Security_updateACL (72.93s)
--- PASS: TestAccS3Bucket_Basic_emptyString (36.60s)
--- PASS: TestAccS3Bucket_Replication_basic (189.82s)
--- PASS: TestAccS3Bucket_Tags_ignoreTags (65.31s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (69.59s)
--- PASS: TestAccS3Bucket_Basic_acceleration (74.41s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (197.67s)
--- PASS: TestAccS3Bucket_Web_simple (110.98s)
--- PASS: TestAccS3Bucket_Web_redirect (111.26s)
--- PASS: TestAccS3Bucket_Security_updateGrant (104.59s)
--- PASS: TestAccS3Bucket_Security_policy (100.49s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (239.36s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (122.08s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (166.81s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	306.973s

@github-actions github-actions bot added service/s3 Issues and PRs that pertain to the s3 service. size/XS Managed by automation to categorize the size of a PR. and removed service/s3 Issues and PRs that pertain to the s3 service. labels Jan 13, 2022
@github-actions github-actions bot added the service/s3 Issues and PRs that pertain to the s3 service. label Jan 13, 2022
@YakDriver YakDriver added the partition/aws-iso Pertains to the aws-iso partition. label Jan 13, 2022
@YakDriver YakDriver added this to the v3.72.0 milestone Jan 13, 2022
@YakDriver YakDriver merged commit 9cb4ed3 into main Jan 13, 2022
@YakDriver YakDriver deleted the f-s3-bucket-object-lock-iso-compat branch January 13, 2022 20:59
github-actions bot pushed a commit that referenced this pull request Jan 13, 2022
@github-actions
Copy link

This functionality has been released in v3.72.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 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
partition/aws-iso Pertains to the aws-iso partition. service/s3 Issues and PRs that pertain to the s3 service. size/XS Managed by automation to categorize the size of a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant