s3_object_copy: New resource by YakDriver · Pull Request #15461 · hashicorp/terraform-provider-aws

YakDriver · 2020-10-02T19:57:55Z

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

This is designed differently than the typical resource with its focus on object copying.

Release note for CHANGELOG:

aws_s3_object_copy: New resource

The output from acceptance testing:

--- PASS: TestAccAWSS3ObjectCopy_basic (31.81s)

gdavison

I have a number of suggested changes. I'm also getting an non-empty plan for TestAccAWSS3BucketObject_ignoreTags

gdavison · 2020-11-05T22:37:51Z

+	return nil
+}
+
+func resourceAwsS3ObjectCopyCopy(d *schema.ResourceData, meta interface{}) error {


Naming nit: CopyCopy looks a little odd. Maybe something like resourceAwsS3ObjectCopyPerformCopy()

What about resourceAwsS3ObjectCopyDoCopy()?

gdavison · 2020-11-05T22:49:07Z

+			"force_destroy": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},


force_destroy isn't referenced anywhere, is the implementation missing?

This resource uses the Delete from s3_bucket_object (resourceAwsS3BucketObjectDelete) which uses the force_destroy arg.

Never mind. Now it has its own delete!

gdavison · 2020-11-05T23:17:57Z

+	return resourceAwsS3BucketObjectRead(d, meta)
+}
+
+func resourceAwsS3ObjectCopyIncludeGrants(input *s3.CopyObjectInput, d *schema.ResourceData) error {


This only seems to return nil

Completely re-wrote the expand part.

gdavison · 2020-11-05T23:27:25Z

+		Read:   resourceAwsS3BucketObjectRead,
+		Update: resourceAwsS3ObjectCopyUpdate,
+		Delete: resourceAwsS3BucketObjectDelete,


Typically, we avoid reusing implementations across resource types. resourceAwsS3BucketObjectRead and resourceAwsS3BucketObjectDelete should have local implementations

YakDriver · 2021-02-12T17:16:10Z

I'm also getting an non-empty plan for TestAccAWSS3BucketObject_ignoreTags

This happens all the time unrelated to this PR. See #17599.

Fixed

YakDriver · 2021-02-13T00:02:07Z

 	return nil
 }

+func resourceAwsS3BucketObjectSetKMS(d *schema.ResourceData, meta interface{}, sseKMSKeyId *string) error {


Breaking this out is necessary to avoid having 2 services (s3, kms) in aws_s3_object_copy. This way, it can call the s3_bucket_object function.

gdavison

A few suggestions, otherwise looks good to me 🚀

Commercial partition

--- PASS: TestAccAWSS3BucketObject_noNameNoKey (17.49s)
--- PASS: TestAccDataSourceAWSS3BucketObject_readableBody (62.95s)
--- PASS: TestAccDataSourceAWSS3BucketObject_basicViaAccessPoint (63.39s)
--- PASS: TestAccDataSourceAWSS3BucketObject_basic (63.50s)
--- PASS: TestAccDataSourceAWSS3BucketObject_SingleSlashAsKey (64.27s)
--- PASS: TestAccAWSS3BucketObject_empty (64.79s)
--- PASS: TestAccDataSourceAWSS3BucketObject_kmsEncrypted (64.86s)
--- PASS: TestAccDataSourceAWSS3BucketObject_ObjectLockLegalHoldOn (66.28s)
--- PASS: TestAccDataSourceAWSS3BucketObject_allParams (67.43s)
--- PASS: TestAccDataSourceAWSS3BucketObject_ObjectLockLegalHoldOff (67.58s)
--- PASS: TestAccAWSS3BucketObject_source (61.08s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_basic (111.32s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_all (113.27s)
--- PASS: TestAccDataSourceAWSS3BucketObject_MultipleSlashes (114.34s)
--- PASS: TestAccDataSourceAWSS3BucketObject_LeadingSlash (114.58s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_fetchOwner (114.71s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_prefixes (115.81s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_encoded (115.86s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_startAfter (117.67s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_basicViaAccessPoint (117.62s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_maxKeys (117.94s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (61.40s)
--- PASS: TestAccAWSS3BucketObject_content (63.72s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (64.53s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (63.95s)
--- PASS: TestAccAWSS3BucketObject_NonVersioned (65.44s)
--- PASS: TestAccAWSS3BucketObject_kms (63.68s)
--- PASS: TestAccAWSS3BucketObject_sse (59.82s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (108.48s)
--- PASS: TestAccAWSS3BucketObject_updates (111.93s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (110.85s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioningViaAccessPoint (111.53s)
--- PASS: TestAccAWSS3BucketObject_defaultBucketSSE (56.64s)
--- PASS: TestAccAWSS3ObjectCopy_basic (56.66s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (90.43s)
--- PASS: TestAccAWSS3BucketObject_ignoreTags (85.50s)
--- PASS: TestAccAWSS3BucketObject_acl (117.94s)
--- PASS: TestAccAWSS3BucketObject_metadata (119.29s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (116.09s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (109.16s)
--- PASS: TestAccAWSS3BucketObject_tagsMultipleSlashes (130.43s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingMultipleSlashes (132.85s)
--- PASS: TestAccAWSS3BucketObject_tags (134.48s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSingleSlash (133.41s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (122.64s)
--- PASS: TestAccAWSS3BucketObject_storageClass (142.34s)

GovCloud partition

--- PASS: TestAccDataSourceAWSS3BucketObject_SingleSlashAsKey (46.04s)
--- PASS: TestAccDataSourceAWSS3BucketObject_basic (46.24s)
--- PASS: TestAccDataSourceAWSS3BucketObject_basicViaAccessPoint (46.24s)
--- PASS: TestAccDataSourceAWSS3BucketObject_kmsEncrypted (46.65s)
--- PASS: TestAccDataSourceAWSS3BucketObject_readableBody (47.40s)
--- PASS: TestAccDataSourceAWSS3BucketObject_ObjectLockLegalHoldOn (47.55s)
--- PASS: TestAccDataSourceAWSS3BucketObject_ObjectLockLegalHoldOff (47.85s)
--- PASS: TestAccDataSourceAWSS3BucketObject_allParams (48.31s)
--- PASS: TestAccAWSS3BucketObject_noNameNoKey (14.46s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_encoded (84.34s)
--- PASS: TestAccDataSourceAWSS3BucketObject_MultipleSlashes (85.05s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_basic (85.75s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_prefixes (86.46s)
--- PASS: TestAccDataSourceAWSS3BucketObject_LeadingSlash (86.02s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_all (86.19s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_basicViaAccessPoint (88.39s)
--- PASS: TestAccAWSS3BucketObject_empty (45.17s)
--- PASS: TestAccAWSS3BucketObject_content (46.48s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (46.04s)
--- PASS: TestAccAWSS3BucketObject_source (47.34s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (48.19s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (48.13s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_maxKeys (86.23s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_startAfter (86.78s)
--- PASS: TestAccAWSS3BucketObject_NonVersioned (47.99s)
--- PASS: TestAccAWSS3BucketObject_kms (46.26s)
--- PASS: TestAccDataSourceAWSS3BucketObjects_fetchOwner (88.46s)
--- PASS: TestAccAWSS3BucketObject_sse (45.57s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (82.10s)
--- PASS: TestAccAWSS3BucketObject_updates (84.08s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (84.95s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioningViaAccessPoint (86.55s)
--- PASS: TestAccAWSS3BucketObject_metadata (116.25s)
--- PASS: TestAccAWSS3BucketObject_defaultBucketSSE (43.76s)
--- PASS: TestAccAWSS3BucketObject_acl (117.96s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (81.39s)
--- PASS: TestAccAWSS3ObjectCopy_basic (44.82s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (101.64s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (100.87s)
--- PASS: TestAccAWSS3BucketObject_ignoreTags (66.85s)
--- PASS: TestAccAWSS3BucketObject_tags (131.22s)
--- PASS: TestAccAWSS3BucketObject_storageClass (152.12s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSingleSlash (115.50s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingMultipleSlashes (115.33s)
--- PASS: TestAccAWSS3BucketObject_tagsMultipleSlashes (114.98s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (110.35s)

Co-authored-by: Graham Davison <gdavison@hashicorp.com>

ghost · 2021-02-19T16:55:26Z

This has been released in version 3.29.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 · 2021-03-20T17:11:01Z

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!

YakDriver requested a review from a team October 2, 2020 19:57

YakDriver force-pushed the f-s3-obj-copy branch 2 times, most recently from 9b0b947 to ad0282a Compare October 2, 2020 21:18

ghost added the documentation Introduces or discusses updates to documentation. label Oct 2, 2020

YakDriver force-pushed the f-s3-obj-copy branch 2 times, most recently from f952f99 to 0a552ad Compare October 7, 2020 11:55

YakDriver added the partition/aws-us-gov Pertains to the aws-us-gov partition. label Oct 15, 2020

gdavison self-assigned this Nov 5, 2020

gdavison previously requested changes Nov 5, 2020

View reviewed changes

bflad mentioned this pull request Nov 9, 2020

r/aws_s3_bucket_object: Enable source to be an s3 source #6383

Closed

Base automatically changed from master to main January 23, 2021 00:59

breathingdust requested a review from a team as a code owner January 23, 2021 00:59

YakDriver force-pushed the f-s3-obj-copy branch from 0a552ad to b18a837 Compare February 12, 2021 16:24

ghost added size/XXL Managed by automation to categorize the size of a PR. size/XL Managed by automation to categorize the size of a PR. and removed size/XL Managed by automation to categorize the size of a PR. size/XXL Managed by automation to categorize the size of a PR. labels Feb 12, 2021

YakDriver force-pushed the f-s3-obj-copy branch from 8a7a8f0 to fe36cfe Compare February 12, 2021 23:31

YakDriver added 5 commits February 12, 2021 18:42

s3_object_copy: New resource

8ba810e

resource/s3_object_copy: Revert provider

86e0de7

resource/s3_object_copy: Minor cleanup

f3fc3fa

resoure/s3_object_copy: Remove unused fields

93c80b0

resource/s3_object_copy: Remove copy fields from update on change

b6a15ea

YakDriver added 4 commits February 12, 2021 18:42

resource/s3_object_copy: Rewrite grants

fed7b5c

resource/s3_object_copy: Add local read/delete

e81bd1b

docs/s3_object_copy: Clean up docs

d36a176

resource/s3_object_copy: Lint

5d60673

YakDriver force-pushed the f-s3-obj-copy branch from d898c81 to 5d60673 Compare February 12, 2021 23:42

resource/s3_object_copy: Rework kms setting

3af5293

YakDriver requested a review from gdavison February 12, 2021 23:56

docs/s3_object_copy: Lint

e8453b6

YakDriver commented Feb 13, 2021

View reviewed changes

gdavison approved these changes Feb 17, 2021

View reviewed changes

Comment thread aws/resource_aws_s3_object_copy.go Outdated

Comment thread aws/resource_aws_s3_object_copy.go Outdated

Comment thread aws/resource_aws_s3_object_copy.go Outdated

Comment thread aws/resource_aws_s3_object_copy.go Outdated

Comment thread aws/resource_aws_s3_object_copy.go Outdated

YakDriver added this to the v3.29.0 milestone Feb 18, 2021

YakDriver and others added 5 commits February 18, 2021 09:55

resource/s3_object_copy: Review updates

7988db3

Co-authored-by: Graham Davison <gdavison@hashicorp.com>

resource/s3_object_copy: Review updates

a4c6ca5

Co-authored-by: Graham Davison <gdavison@hashicorp.com>

resource/s3_object_copy: Review updates

a090e5f

Co-authored-by: Graham Davison <gdavison@hashicorp.com>

resource/s3_object_copy: Review updates

4c69f49

Co-authored-by: Graham Davison <gdavison@hashicorp.com>

resource/s3_object_copy: Review updates

f419e31

Co-authored-by: Graham Davison <gdavison@hashicorp.com>

YakDriver merged commit 049ed26 into main Feb 18, 2021

YakDriver deleted the f-s3-obj-copy branch February 18, 2021 14:56

YakDriver mentioned this pull request Feb 18, 2021

resource/s3_object_copy: Fix imports #17687

Merged

lorengordon mentioned this pull request Mar 16, 2021

Support s3:// URIs in "source" field for aws_s3_bucket_object resource #3943

Closed

ghost locked as resolved and limited conversation to collaborators Mar 20, 2021

Conversation

YakDriver commented Oct 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Community Note

Uh oh!

gdavison left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

YakDriver commented Feb 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gdavison left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghost commented Feb 19, 2021

Uh oh!

ghost commented Mar 20, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

YakDriver commented Oct 2, 2020 •

edited

Loading

YakDriver commented Feb 12, 2021 •

edited

Loading