refactoring to remove dependency on hardcoded region

Author: ORybak5

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

@@ -5,7 +5,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
 import lombok.Getter;
@@ -17,7 +16,6 @@
 @ConfigurationProperties(prefix = "gp2gp.storage")
 public class StorageConnectorConfiguration {
 
-    private static final Region REGION = Region.EU_WEST_2;
     private static final String S3_PREFIX = "s3";
 
     private String type;
@@ -29,7 +27,7 @@ public class StorageConnectorConfiguration {
     @Bean
     public S3Client getS3Client() {
         if (StringUtils.isNotBlank(trustStoreUrl) && trustStoreUrl.startsWith(S3_PREFIX)) {
-            return S3Client.builder().region(REGION).build();
+            return S3Client.builder().build();
         }
 
         return null;

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

@@ -1,9 +1,7 @@
 package uk.nhs.adaptors.gp2gp.common.storage;
 
 import org.springframework.beans.factory.FactoryBean;
-
 import lombok.Setter;
-import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
 @Setter
@@ -17,7 +15,7 @@ public StorageConnector getObject() {
         if (storageConnector == null) {
             switch (StorageConnectorOptions.enumOf(configuration.getType())) {
                 case S3:
-                    storageConnector = new S3StorageConnector(S3Client.builder().region(Region.EU_WEST_2).build(), configuration);
+                    storageConnector = new S3StorageConnector(S3Client.builder().build(), configuration);
                     break;
                 case AZURE:
                     storageConnector = new AzureStorageConnector();

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/CustomTrustStoreTest.java

@@ -37,8 +37,8 @@ static void setUp() {
             .endpointOverride(URI.create("http://localhost:" + PORT))
             .credentialsProvider(StaticCredentialsProvider.create(
                 AwsBasicCredentials.create("accessKey", "secretKey")))
-            .region(Region.EU_WEST_2)
             .serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build())
+            .region(Region.EU_WEST_2)
             .build();
 
         s3Client.createBucket(CreateBucketRequest.builder().bucket(BUCKET_NAME).build());