Skip to content

Validation of s3 objects deletion #92

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
whummer merged 1 commit into from
Jul 25, 2022
Merged

Validation of s3 objects deletion #92

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
38 changes: 38 additions & 0 deletions src/test/java/cloud/localstack/awssdkv1/S3FeaturesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;

import cloud.localstack.*;
import cloud.localstack.docker.annotation.LocalstackDockerProperties;
Expand All @@ -25,6 +26,7 @@

import com.amazonaws.HttpMethod;
import com.amazonaws.client.builder.AwsClientBuilder;
import com.amazonaws.services.mediastoredata.model.DeleteObjectResult;
import com.amazonaws.services.s3.*;
import com.amazonaws.services.s3.model.*;
import com.amazonaws.services.s3.model.lifecycle.*;
Expand Down Expand Up @@ -122,6 +124,42 @@ public void testMetadata() {
Assert.assertEquals(originalMetadata, receivedMetadata);
}

/**
* Test S3 objects deletion
*/
@Test
public void testObjectDeletion() {
AmazonS3 s3 = TestUtils.getClientS3();
String bucketName = UUID.randomUUID().toString();
s3.createBucket(bucketName);

Map<String, String> originalMetadata = new HashMap<String, String>();
originalMetadata.put("key1", "val1");
originalMetadata.put("key_2", "val2");
originalMetadata.put("__key3", "val3");

ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setUserMetadata(originalMetadata);

String keyName = "my-key-1";
InputStream is = new ByteArrayInputStream("test-string".getBytes(StandardCharsets.UTF_8));
s3.putObject(new PutObjectRequest(bucketName, keyName, is, objectMetadata));
s3.deleteObject(new DeleteObjectRequest(bucketName, keyName));

AmazonS3Exception exception = assertThrows(AmazonS3Exception.class, () -> {
s3.getObject(new GetObjectRequest(bucketName, keyName));
});
Assert.assertEquals(exception.getErrorCode(), "NoSuchKey");

s3.putObject(new PutObjectRequest(bucketName, keyName, is, objectMetadata));
s3.deleteObjects(new DeleteObjectsRequest(bucketName).withKeys(keyName));

AmazonS3Exception exception2 = assertThrows(AmazonS3Exception.class, () -> {
s3.getObject(new GetObjectRequest(bucketName, keyName));
});
Assert.assertEquals(exception2.getErrorCode(), "NoSuchKey");
}

@Test
public void testListNextBatchOfObjects() {
AmazonS3 s3Client = TestUtils.getClientS3();
Expand Down
44 changes: 44 additions & 0 deletions src/test/java/cloud/localstack/awssdkv2/BasicFeaturesSDKV2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import org.testcontainers.utility.ThrowingFunction;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.core.SdkSystemSetting;
import software.amazon.awssdk.core.async.AsyncRequestBody;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
import software.amazon.awssdk.services.cloudwatch.model.Dimension;
Expand Down Expand Up @@ -55,8 +57,12 @@
import software.amazon.awssdk.services.s3.model.Bucket;
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
import software.amazon.awssdk.services.s3.model.CreateBucketResponse;
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.model.ListBucketsRequest;
import software.amazon.awssdk.services.s3.model.ListBucketsResponse;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.S3Exception;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerAsyncClient;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretRequest;
Expand All @@ -82,14 +88,20 @@
import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import software.amazon.awssdk.services.ssm.model.PutParameterResponse;

import static org.junit.Assert.assertThrows;

import java.nio.ByteBuffer;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

Expand Down Expand Up @@ -620,4 +632,36 @@ public void testIAMListUserPaginationAsync() throws Exception {
Assert.assertTrue(userFound.get());
}

@Test
public void testS3ObjectDeletion() {
S3AsyncClient s3 = TestUtils.getClientS3AsyncV2();

String bucketName = UUID.randomUUID().toString();
CreateBucketRequest createBucketRequest = CreateBucketRequest.builder().bucket(bucketName).build();
s3.createBucket(createBucketRequest).join();

String keyName = "my-key-1";
PutObjectRequest objectRequest = PutObjectRequest.builder().bucket(bucketName).key(keyName).build();
AsyncRequestBody requestBody = AsyncRequestBody.fromBytes("data".getBytes());
s3.putObject(objectRequest, requestBody).join();

DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(bucketName).key(keyName).build();
s3.deleteObject(deleteObjectRequest).join();

GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucketName).key(keyName).build();

CompletionException exception = assertThrows(CompletionException.class, () -> {
s3.getObject(getObjectRequest, AsyncResponseTransformer.toBytes()).join();
});
Assert.assertTrue(exception.getCause().getMessage().contains("The specified key does not exist."));

s3.putObject(objectRequest, requestBody).join();
s3.deleteObject(deleteObjectRequest).join();

CompletionException exception2 = assertThrows(CompletionException.class, () -> {
s3.getObject(getObjectRequest, AsyncResponseTransformer.toBytes()).join();
});
Assert.assertTrue(exception2.getCause().getMessage().contains("The specified key does not exist."));
}

}