attempting to access more regions than are in the Regions enum

USACE · Apr 23, 2024 · edee66a · edee66a
1 parent 6efea2e
commit edee66a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/usace/cc/plugin/CcStoreS3.java b/src/main/java/usace/cc/plugin/CcStoreS3.java
@@ -17,6 +17,8 @@
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.regions.Regions;
+import com.amazonaws.regions.Region;
+import com.amazonaws.regions.RegionUtils;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.AmazonS3Exception;
@@ -54,7 +56,7 @@ public CcStoreS3(){
         //System.out.println(EnvironmentVariables.CC_PROFILE + "_" + EnvironmentVariables.AWS_ACCESS_KEY_ID+"::"+config.aws_access_key_id);
         //System.out.println(EnvironmentVariables.CC_PROFILE + "_" + EnvironmentVariables.AWS_SECRET_ACCESS_KEY+"::"+config.aws_secret_access_key_id);
         //System.out.println(EnvironmentVariables.CC_PROFILE + "_" + EnvironmentVariables.AWS_S3_BUCKET+"::"+config.aws_bucket);
-        Regions clientRegion = Regions.valueOf(config.aws_region.toUpperCase().replace("-", "_"));
+        Region clientRegion = RegionUtils.getRegion(config.aws_region.toUpperCase().replace("-", "_"));//Regions.valueOf(config.aws_region.toUpperCase().replace("-", "_"));
         try {
             AmazonS3 s3Client = null;
             if(config.aws_mock){
@@ -70,7 +72,7 @@ public CcStoreS3(){
 
                 s3Client = AmazonS3ClientBuilder
                     .standard()
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.aws_endpoint, clientRegion.name()))
+                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.aws_endpoint, clientRegion.getName()))
                     .withPathStyleAccessEnabled(config.aws_force_path_style)
                     .withClientConfiguration(clientConfiguration)
                     .withCredentials(new AWSStaticCredentialsProvider(credentials))
@@ -79,7 +81,7 @@ public CcStoreS3(){
                 AWSCredentials credentials = new BasicAWSCredentials(config.aws_access_key_id, config.aws_secret_access_key_id);
                 s3Client = AmazonS3ClientBuilder
                     .standard()
-                    .withRegion(clientRegion)
+                    .withRegion(clientRegion.getName())
                     .withCredentials(new AWSStaticCredentialsProvider(credentials))
                     .build();                
             }

diff --git a/src/main/java/usace/cc/plugin/FileDataStoreS3.java b/src/main/java/usace/cc/plugin/FileDataStoreS3.java
@@ -14,6 +14,8 @@
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.regions.Regions;
+import com.amazonaws.regions.Region;
+import com.amazonaws.regions.RegionUtils;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.DeleteObjectRequest;
@@ -101,7 +103,7 @@ public FileDataStoreS3(DataStore ds){
         //System.out.println(ds.getDsProfile() + "_" + EnvironmentVariables.AWS_SECRET_ACCESS_KEY+"::"+config.aws_secret_access_key_id);
         //System.out.println(ds.getDsProfile() + "_" + EnvironmentVariables.AWS_S3_BUCKET+"::"+config.aws_bucket);
 
-        Regions clientRegion = Regions.valueOf(config.aws_region.toUpperCase().replace("-", "_"));
+        Region clientRegion = RegionUtils.getRegion(config.aws_region.toUpperCase().replace("-", "_"));//Regions.valueOf(config.aws_region.toUpperCase().replace("-", "_"));
         try {
             AmazonS3 s3Client = null;
             if(config.aws_mock){
@@ -112,7 +114,7 @@ public FileDataStoreS3(DataStore ds){
 
                 s3Client = AmazonS3ClientBuilder
                     .standard()
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.aws_endpoint, clientRegion.name()))
+                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.aws_endpoint, clientRegion.getName()))
                     .withPathStyleAccessEnabled(config.aws_force_path_style)
                     .withClientConfiguration(clientConfiguration)
                     .withCredentials(new AWSStaticCredentialsProvider(credentials))
@@ -121,7 +123,7 @@ public FileDataStoreS3(DataStore ds){
                 AWSCredentials credentials = new BasicAWSCredentials(config.aws_access_key_id, config.aws_secret_access_key_id);
                 s3Client = AmazonS3ClientBuilder
                     .standard()
-                    .withRegion(clientRegion)
+                    .withRegion(clientRegion.getName())
                     .withCredentials(new AWSStaticCredentialsProvider(credentials))
                     .build();                
             }