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

Use s3manager.Uploader for creating S3 bucket objects #21727

Merged
merged 6 commits into from
Jan 3, 2022
Merged

Use s3manager.Uploader for creating S3 bucket objects #21727

merged 6 commits into from
Jan 3, 2022

Conversation

cpcloud
Copy link
Contributor

@cpcloud cpcloud commented Nov 11, 2021

This PR is equivalent to #14382, but conforms to the new directory layout
resulting from #21306.

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 #788.
Closes #19336.
Supersedes #14382.

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccXXX'

...

@github-actions github-actions bot added needs-triage Waiting for first response or review from a maintainer. size/S Managed by automation to categorize the size of a PR. service/s3 Issues and PRs that pertain to the s3 service. labels Nov 11, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @cpcloud 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTING guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@justinretzolk justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Nov 11, 2021
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 12, 2021

@justinretzolk Is there anything I should do in the meantime while awaiting review?

@cpcloud
Copy link
Contributor Author

cpcloud commented Dec 2, 2021

@justinretzolk Any updates here? Anything I can do to help move this along?

@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. and removed size/S Managed by automation to categorize the size of a PR. labels Jan 3, 2022
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Jan 3, 2022
Copy link
Contributor

@ewbankkit ewbankkit 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=TestAccS3BucketObject_' PKG_NAME=internal/service/s3     
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run=TestAccS3BucketObject_ -timeout 180m
=== RUN   TestAccS3BucketObject_noNameNoKey
=== PAUSE TestAccS3BucketObject_noNameNoKey
=== RUN   TestAccS3BucketObject_empty
=== PAUSE TestAccS3BucketObject_empty
=== RUN   TestAccS3BucketObject_source
=== PAUSE TestAccS3BucketObject_source
=== RUN   TestAccS3BucketObject_content
=== PAUSE TestAccS3BucketObject_content
=== RUN   TestAccS3BucketObject_etagEncryption
=== PAUSE TestAccS3BucketObject_etagEncryption
=== RUN   TestAccS3BucketObject_contentBase64
=== PAUSE TestAccS3BucketObject_contentBase64
=== RUN   TestAccS3BucketObject_sourceHashTrigger
=== PAUSE TestAccS3BucketObject_sourceHashTrigger
=== RUN   TestAccS3BucketObject_withContentCharacteristics
=== PAUSE TestAccS3BucketObject_withContentCharacteristics
=== RUN   TestAccS3BucketObject_nonVersioned
=== PAUSE TestAccS3BucketObject_nonVersioned
=== RUN   TestAccS3BucketObject_updates
=== PAUSE TestAccS3BucketObject_updates
=== RUN   TestAccS3BucketObject_updateSameFile
=== PAUSE TestAccS3BucketObject_updateSameFile
=== RUN   TestAccS3BucketObject_updatesWithVersioning
=== PAUSE TestAccS3BucketObject_updatesWithVersioning
=== RUN   TestAccS3BucketObject_updatesWithVersioningViaAccessPoint
=== PAUSE TestAccS3BucketObject_updatesWithVersioningViaAccessPoint
=== RUN   TestAccS3BucketObject_kms
=== PAUSE TestAccS3BucketObject_kms
=== RUN   TestAccS3BucketObject_sse
=== PAUSE TestAccS3BucketObject_sse
=== RUN   TestAccS3BucketObject_acl
=== PAUSE TestAccS3BucketObject_acl
=== RUN   TestAccS3BucketObject_metadata
=== PAUSE TestAccS3BucketObject_metadata
=== RUN   TestAccS3BucketObject_storageClass
=== PAUSE TestAccS3BucketObject_storageClass
=== RUN   TestAccS3BucketObject_tags
=== PAUSE TestAccS3BucketObject_tags
=== RUN   TestAccS3BucketObject_tagsLeadingSingleSlash
=== PAUSE TestAccS3BucketObject_tagsLeadingSingleSlash
=== RUN   TestAccS3BucketObject_tagsLeadingMultipleSlashes
=== PAUSE TestAccS3BucketObject_tagsLeadingMultipleSlashes
=== RUN   TestAccS3BucketObject_tagsMultipleSlashes
=== PAUSE TestAccS3BucketObject_tagsMultipleSlashes
=== RUN   TestAccS3BucketObject_objectLockLegalHoldStartWithNone
=== PAUSE TestAccS3BucketObject_objectLockLegalHoldStartWithNone
=== RUN   TestAccS3BucketObject_objectLockLegalHoldStartWithOn
=== PAUSE TestAccS3BucketObject_objectLockLegalHoldStartWithOn
=== RUN   TestAccS3BucketObject_objectLockRetentionStartWithNone
=== PAUSE TestAccS3BucketObject_objectLockRetentionStartWithNone
=== RUN   TestAccS3BucketObject_objectLockRetentionStartWithSet
=== PAUSE TestAccS3BucketObject_objectLockRetentionStartWithSet
=== RUN   TestAccS3BucketObject_objectBucketKeyEnabled
=== PAUSE TestAccS3BucketObject_objectBucketKeyEnabled
=== RUN   TestAccS3BucketObject_bucketBucketKeyEnabled
=== PAUSE TestAccS3BucketObject_bucketBucketKeyEnabled
=== RUN   TestAccS3BucketObject_defaultBucketSSE
=== PAUSE TestAccS3BucketObject_defaultBucketSSE
=== RUN   TestAccS3BucketObject_ignoreTags
=== PAUSE TestAccS3BucketObject_ignoreTags
=== CONT  TestAccS3BucketObject_noNameNoKey
=== CONT  TestAccS3BucketObject_metadata
=== CONT  TestAccS3BucketObject_withContentCharacteristics
=== CONT  TestAccS3BucketObject_nonVersioned
=== CONT  TestAccS3BucketObject_acl
=== CONT  TestAccS3BucketObject_sse
=== CONT  TestAccS3BucketObject_kms
=== CONT  TestAccS3BucketObject_updatesWithVersioningViaAccessPoint
=== CONT  TestAccS3BucketObject_updatesWithVersioning
=== CONT  TestAccS3BucketObject_updateSameFile
=== CONT  TestAccS3BucketObject_updates
=== CONT  TestAccS3BucketObject_empty
=== CONT  TestAccS3BucketObject_etagEncryption
=== CONT  TestAccS3BucketObject_content
=== CONT  TestAccS3BucketObject_defaultBucketSSE
=== CONT  TestAccS3BucketObject_ignoreTags
=== CONT  TestAccS3BucketObject_source
=== CONT  TestAccS3BucketObject_tagsLeadingMultipleSlashes
=== CONT  TestAccS3BucketObject_sourceHashTrigger
=== CONT  TestAccS3BucketObject_objectLockRetentionStartWithNone
=== CONT  TestAccS3BucketObject_nonVersioned
    acctest.go:1114: skipping test; environment variable TF_ACC_ASSUME_ROLE_ARN must be set. Usage: Amazon Resource Name (ARN) of existing IAM Role to assume for testing restricted permissions
--- SKIP: TestAccS3BucketObject_nonVersioned (1.12s)
=== CONT  TestAccS3BucketObject_objectLockLegalHoldStartWithOn
--- PASS: TestAccS3BucketObject_noNameNoKey (6.68s)
=== CONT  TestAccS3BucketObject_objectLockLegalHoldStartWithNone
--- PASS: TestAccS3BucketObject_withContentCharacteristics (42.04s)
=== CONT  TestAccS3BucketObject_tagsMultipleSlashes
--- PASS: TestAccS3BucketObject_etagEncryption (42.09s)
=== CONT  TestAccS3BucketObject_tagsLeadingSingleSlash
--- PASS: TestAccS3BucketObject_content (49.85s)
=== CONT  TestAccS3BucketObject_tags
--- PASS: TestAccS3BucketObject_kms (54.47s)
=== CONT  TestAccS3BucketObject_storageClass
--- PASS: TestAccS3BucketObject_sse (54.69s)
=== CONT  TestAccS3BucketObject_contentBase64
--- PASS: TestAccS3BucketObject_source (55.93s)
=== CONT  TestAccS3BucketObject_objectBucketKeyEnabled
--- PASS: TestAccS3BucketObject_empty (55.96s)
=== CONT  TestAccS3BucketObject_bucketBucketKeyEnabled
--- PASS: TestAccS3BucketObject_defaultBucketSSE (56.70s)
=== CONT  TestAccS3BucketObject_objectLockRetentionStartWithSet
--- PASS: TestAccS3BucketObject_updates (86.13s)
--- PASS: TestAccS3BucketObject_updateSameFile (90.13s)
--- PASS: TestAccS3BucketObject_sourceHashTrigger (91.09s)
--- PASS: TestAccS3BucketObject_objectLockLegalHoldStartWithOn (90.06s)
--- PASS: TestAccS3BucketObject_contentBase64 (38.91s)
--- PASS: TestAccS3BucketObject_objectBucketKeyEnabled (38.24s)
--- PASS: TestAccS3BucketObject_ignoreTags (94.96s)
--- PASS: TestAccS3BucketObject_updatesWithVersioning (95.07s)
--- PASS: TestAccS3BucketObject_updatesWithVersioningViaAccessPoint (96.07s)
--- PASS: TestAccS3BucketObject_bucketBucketKeyEnabled (41.99s)
--- PASS: TestAccS3BucketObject_metadata (113.64s)
--- PASS: TestAccS3BucketObject_objectLockRetentionStartWithNone (118.80s)
--- PASS: TestAccS3BucketObject_objectLockLegalHoldStartWithNone (113.18s)
--- PASS: TestAccS3BucketObject_acl (121.92s)
--- PASS: TestAccS3BucketObject_tagsLeadingMultipleSlashes (146.50s)
--- PASS: TestAccS3BucketObject_tagsMultipleSlashes (118.95s)
--- PASS: TestAccS3BucketObject_tagsLeadingSingleSlash (121.63s)
--- PASS: TestAccS3BucketObject_tags (115.85s)
--- PASS: TestAccS3BucketObject_objectLockRetentionStartWithSet (115.02s)
--- PASS: TestAccS3BucketObject_storageClass (139.15s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	197.055s

@ewbankkit
Copy link
Contributor

@cpcloud Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit d300332 into hashicorp:main Jan 3, 2022
@github-actions github-actions bot added this to the v3.71.0 milestone Jan 3, 2022
@cpcloud cpcloud deleted the s3-bucket-object-uploader branch January 3, 2022 23:11
@github-actions
Copy link

github-actions bot commented Jan 6, 2022

This functionality has been released in v3.71.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 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/s3 Issues and PRs that pertain to the s3 service. size/XL Managed by automation to categorize the size of a PR.
Projects
None yet
4 participants