Skip to content

Add support for tagging builder in createMultipartUploadRequest #1581

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

Merged
merged 1 commit into from
Jan 9, 2020
Merged

Add support for tagging builder in createMultipartUploadRequest #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/next-release/feature-AmazonS3-7700da3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"category": "Amazon S3",
"type": "feature",
"description": "Add support for Tagging builder in `CreateMultipartUploadRequest`. See [#1440](https://github.com/aws/aws-sdk-java-v2/issues/1440)"
}
48 changes: 38 additions & 10 deletions services/s3/src/it/java/software/amazon/awssdk/services/s3/ObjectTaggingIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@

import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.services.s3.model.BucketVersioningStatus;
import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
import software.amazon.awssdk.services.s3.model.DeleteObjectTaggingRequest;
import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;
Expand All @@ -33,6 +35,7 @@
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.Tag;
import software.amazon.awssdk.services.s3.model.Tagging;
import software.amazon.awssdk.services.s3.model.UploadPartResponse;
import software.amazon.awssdk.services.s3.model.VersioningConfiguration;

/**
Expand Down Expand Up @@ -95,10 +98,7 @@ public void putObject_WithTagging_Succeeds() {

@Test
public void getObjectTagging_Succeeds() {
List<Tag> tagSet = new ArrayList<>();
tagSet.add(Tag.builder().key("foo").value("1").build());
tagSet.add(Tag.builder().key("bar").value("2").build());
tagSet.add(Tag.builder().key("baz").value("3").build());
List<Tag> tagSet = tags();

Tagging tags = Tagging.builder().tagSet(tagSet).build();

Expand Down Expand Up @@ -147,10 +147,7 @@ public void putObjectTagging_Succeeds_WithUrlEncodedTags() {

@Test
public void copyObject_Succeeds_WithNewTags() {
List<Tag> tagSet = new ArrayList<>();
tagSet.add(Tag.builder().key("foo").value("1").build());
tagSet.add(Tag.builder().key("bar").value("2").build());
tagSet.add(Tag.builder().key("baz").value("3").build());
List<Tag> tagSet = tags();

Tagging tags = Tagging.builder().tagSet(tagSet).build();

Expand Down Expand Up @@ -183,12 +180,43 @@ public void copyObject_Succeeds_WithNewTags() {
assertThat(getTaggingResult).containsExactlyInAnyOrder(tagsCopy.tagSet().toArray(new Tag[tagsCopy.tagSet().size()]));
}

@Test
public void testDeleteObjectTagging() {
private List<Tag> tags() {
List<Tag> tagSet = new ArrayList<>();
tagSet.add(Tag.builder().key("foo").value("1").build());
tagSet.add(Tag.builder().key("bar").value("2").build());
tagSet.add(Tag.builder().key("baz").value("3").build());
return tagSet;
}

@Test
public void multipartUploadWithNewTags_shouldSucceed() {
List<Tag> tagSet = tags();

Tagging tags = Tagging.builder().tagSet(tagSet).build();

String key = makeNewKey();
String uploadId =
s3.createMultipartUpload(b -> b.tagging(tags).bucket(BUCKET).key(key)).uploadId();

UploadPartResponse uploadPartResponse = s3.uploadPart(b -> b.bucket(BUCKET).key(key).partNumber(1).uploadId(uploadId),
RequestBody.fromString(RandomStringUtils.random(1000)));
CompletedMultipartUpload parts =
CompletedMultipartUpload.builder().parts(p -> p.partNumber(1).eTag(uploadPartResponse.eTag()).build()).build();

s3.completeMultipartUpload(b -> b.bucket(BUCKET).key(key).multipartUpload(parts).uploadId(uploadId).build());

List<Tag> getTaggingResult = s3.getObjectTagging(GetObjectTaggingRequest.builder()
.bucket(BUCKET)
.key(key)
.build())
.tagSet();

assertThat(getTaggingResult).containsExactlyInAnyOrder(tags.tagSet().toArray(new Tag[0]));
}

@Test
public void testDeleteObjectTagging() {
List<Tag> tagSet = tags();

Tagging tags = Tagging.builder().tagSet(tagSet).build();

Expand Down
6 changes: 6 additions & 0 deletions services/s3/src/main/resources/codegen-resources/customization.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@
"memberName": "Tagging",
"convenienceType": "software.amazon.awssdk.services.s3.model.Tagging",
"typeAdapterFqcn": "software.amazon.awssdk.services.s3.internal.TaggingAdapter"
},
{
"shapeName": "CreateMultipartUploadRequest",
"memberName": "Tagging",
"convenienceType": "software.amazon.awssdk.services.s3.model.Tagging",
"typeAdapterFqcn": "software.amazon.awssdk.services.s3.internal.TaggingAdapter"
}
],
"customResponseMetadata": {
Expand Down