-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: adds transfer multiple S3 objects functionality (#104)
* feat: adds transfer multiple S3 objects functionality * fix: docs, exception handling and headers * fix: imports * fix: kept license header history and exception handling * fix: license header history format
- Loading branch information
1 parent
d030ae7
commit cd7e6bd
Showing
7 changed files
with
196 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ne-aws-s3/src/main/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
...ane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Contributors: | ||
| * Bayerische Motoren Werke Aktiengesellschaft (BMW AG) | ||
| * | ||
| */ | ||
|
|
||
| package org.eclipse.edc.connector.dataplane.aws.s3; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
| import software.amazon.awssdk.services.s3.model.ListObjectsV2Request; | ||
| import software.amazon.awssdk.services.s3.model.ListObjectsV2Response; | ||
| import software.amazon.awssdk.services.s3.model.S3Object; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.atLeastOnce; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.never; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| public class S3DataSourceTest { | ||
|
|
||
| private static final String BUCKET_NAME = "bucketName"; | ||
| private static final String KEY_NAME = "object-1"; | ||
| private static final String KEY_PREFIX = "my-prefix/"; | ||
| private final S3Client s3ClientMock = mock(S3Client.class); | ||
|
|
||
| @Test | ||
| void should_select_prefixed_objects_case_key_prefix_is_present() { | ||
|
|
||
| var mockResponse = ListObjectsV2Response.builder().contents( | ||
| S3Object.builder().key("my-prefix/object-1").build(), | ||
| S3Object.builder().key("my-prefix/object-2").build() | ||
| ).build(); | ||
|
|
||
| var s3Datasource = S3DataSource.Builder.newInstance() | ||
| .bucketName(BUCKET_NAME) | ||
| .keyName(KEY_NAME) | ||
| .keyPrefix(KEY_PREFIX) | ||
| .client(s3ClientMock) | ||
| .build(); | ||
|
|
||
| when(s3ClientMock.listObjectsV2(any(ListObjectsV2Request.class))).thenReturn(mockResponse); | ||
|
|
||
| var result = s3Datasource.openPartStream(); | ||
|
|
||
| assertThat(result.succeeded()).isTrue(); | ||
| verify(s3ClientMock, atLeastOnce()).listObjectsV2(any(ListObjectsV2Request.class)); | ||
| assertThat(result.getContent()).hasSize(2); | ||
| } | ||
|
|
||
| @Test | ||
| void should_fail_case_no_object_is_found() { | ||
|
|
||
| var mockResponse = ListObjectsV2Response.builder().build(); | ||
|
|
||
| var s3Datasource = S3DataSource.Builder.newInstance() | ||
| .bucketName(BUCKET_NAME) | ||
| .keyName(KEY_NAME) | ||
| .keyPrefix(KEY_PREFIX) | ||
| .client(s3ClientMock) | ||
| .build(); | ||
|
|
||
| when(s3ClientMock.listObjectsV2(any(ListObjectsV2Request.class))).thenReturn(mockResponse); | ||
|
|
||
| var result = s3Datasource.openPartStream(); | ||
|
|
||
| assertThat(result.failed()).isTrue(); | ||
| assertThat(result.getFailure().getFailureDetail()).isEqualTo("Error listing S3 objects in the bucket: Object not found"); | ||
| } | ||
|
|
||
| @Test | ||
| void should_select_single_object_case_key_prefix_is_not_present() { | ||
|
|
||
| var s3Datasource = S3DataSource.Builder.newInstance() | ||
| .bucketName(BUCKET_NAME) | ||
| .keyName(KEY_NAME) | ||
| .keyPrefix(null) | ||
| .client(s3ClientMock) | ||
| .build(); | ||
|
|
||
| var result = s3Datasource.openPartStream(); | ||
|
|
||
| assertThat(result.succeeded()).isTrue(); | ||
| verify(s3ClientMock, never()).listObjectsV2(any(ListObjectsV2Request.class)); | ||
| assertThat(result.getContent()).hasSize(1); | ||
| } | ||
|
|
||
| } |