Skip to content

Commit cfd35bb

Browse files
committed
specifying a region for S3Client
1 parent fe24287 commit cfd35bb

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

service/src/main/java/uk/nhs/adaptors/gp2gp/common/storage/StorageConnectorConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
77

8+
import software.amazon.awssdk.regions.Region;
89
import software.amazon.awssdk.services.s3.S3Client;
910

1011
import lombok.Getter;
@@ -26,7 +27,7 @@ public class StorageConnectorConfiguration {
2627
@Bean
2728
public S3Client getS3Client() {
2829
if (StringUtils.isNotBlank(trustStoreUrl) && trustStoreUrl.startsWith(S3_PREFIX)) {
29-
return S3Client.builder().build();
30+
return S3Client.builder().region(Region.EU_WEST_2).build();
3031
}
3132

3233
return null;

service/src/test/java/uk/nhs/adaptors/gp2gp/common/storage/S3StorageConnectorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.mockito.MockitoAnnotations;
77
import software.amazon.awssdk.core.ResponseInputStream;
88
import software.amazon.awssdk.core.sync.RequestBody;
9+
import software.amazon.awssdk.regions.Region;
910
import software.amazon.awssdk.services.s3.S3Client;
1011
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
1112
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
@@ -49,8 +50,8 @@ void setUp() {
4950

5051

5152
@Test
52-
void expectExceptionWhenS3ClientCantDeliverResponse() {
53-
S3StorageConnector storageConnector = new S3StorageConnector(S3Client.builder().build(), config);
53+
void expectExceptionWhenS3ClientCannotDeliverResponse() {
54+
S3StorageConnector storageConnector = new S3StorageConnector(S3Client.builder().region(Region.EU_WEST_2).build(), config);
5455
Exception exception = assertThrows(StorageConnectorException.class,
5556
() -> storageConnector.downloadFromStorage("s3File"));
5657

0 commit comments

Comments
 (0)