Skip to content

Commit 7668baa

Browse files
authored
Provide a deleteObject method in tests and make it so that tests cleanup after themselves (#33)
1 parent 9970104 commit 7668baa

File tree

8 files changed

+266
-98
lines changed

8 files changed

+266
-98
lines changed

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111
import software.amazon.awssdk.core.sync.RequestBody;
1212
import software.amazon.awssdk.core.sync.ResponseTransformer;
1313
import software.amazon.awssdk.services.s3.S3Client;
14+
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
15+
import software.amazon.awssdk.services.s3.model.DeleteObjectResponse;
16+
import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
17+
import software.amazon.awssdk.services.s3.model.DeleteObjectsResponse;
1418
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
1519
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
1620
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
1721
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
22+
import software.amazon.awssdk.services.s3.model.S3Exception;
1823
import software.amazon.encryption.s3.internal.GetEncryptedObjectPipeline;
1924
import software.amazon.encryption.s3.internal.PutEncryptedObjectPipeline;
2025
import software.amazon.encryption.s3.materials.AesKeyring;
@@ -83,6 +88,18 @@ public <T> T getObject(GetObjectRequest getObjectRequest,
8388
return pipeline.getObject(getObjectRequest, responseTransformer);
8489
}
8590

91+
@Override
92+
public DeleteObjectResponse deleteObject(DeleteObjectRequest deleteObjectRequest) throws AwsServiceException,
93+
SdkClientException {
94+
return _wrappedClient.deleteObject(deleteObjectRequest);
95+
}
96+
97+
@Override
98+
public DeleteObjectsResponse deleteObjects(DeleteObjectsRequest deleteObjectsRequest) throws AwsServiceException,
99+
SdkClientException {
100+
return _wrappedClient.deleteObjects(deleteObjectsRequest);
101+
}
102+
86103
@Override
87104
public String serviceName() {
88105
return _wrappedClient.serviceName();

0 commit comments

Comments
 (0)