S3 Connect

- Made its region dynamic - Fixed no endpoint and credentials branch - Remove unneeded key in hash map
virtualcell · Oct 3, 2023 · 97ee3b0 · 97ee3b0
1 parent d851d18
commit 97ee3b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java b/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java
@@ -191,12 +191,14 @@ public void loadN5Dataset(String selectedDataset) throws IOException {
     public void createS3Client(String url, HashMap<String, String> credentials, HashMap<String, String> endpoint){
         AmazonS3ClientBuilder s3ClientBuilder = AmazonS3ClientBuilder.standard();
         URI uri = URI.create(url);
+        String defaultRegion = "site2-low";
 
         // believe that it's a s3 URL
         try{
             AmazonS3URI s3URI = new AmazonS3URI(uri);
             this.s3ObjectKey = s3URI.getKey();
             this.bucketName = s3URI.getBucket();
+            defaultRegion = s3URI.getRegion();
         }
         // otherwise assume it is one of our URLs
         catch (IllegalArgumentException e){
@@ -215,18 +217,11 @@ public void createS3Client(String url, HashMap<String, String> credentials, Hash
         }
         // if nothing is given, default user and return so that code after if statement does not execute
         if(endpoint == null && credentials == null){
-            s3ClientBuilder
-                    .withRegion("site-low")
-                    .withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials()))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration("", ""))
-                    .build();
-
-            this.s3Client = AmazonS3ClientBuilder.standard().withRegion("site-low").withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())).build();
+            this.s3Client = AmazonS3ClientBuilder.standard().withRegion(defaultRegion).withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())).build();
             return;
         }
 
-        //  TODO: hard coding a region is not a solution
-        this.s3Client = s3ClientBuilder.withRegion("site2-low").build();
+        this.s3Client = s3ClientBuilder.withRegion(defaultRegion).build();
     }
 
 

diff --git a/src/main/java/org/vcell/vcellfiji/UI/RemoteFileSelection.java b/src/main/java/org/vcell/vcellfiji/UI/RemoteFileSelection.java
@@ -63,7 +63,6 @@ public HashMap<String, String> returnEndpoint(){
         }
         hashMap.put("Endpoint", this.s3EndpointTextField.getText());
         hashMap.put("Region", this.s3RegionTextField.getText());
-        hashMap.put("Bucket", null);
         return hashMap;
     }