From 0ae67b4efd459cb1a8e209ad055e9927553c0732 Mon Sep 17 00:00:00 2001
From: Ezequiel Valencia <casualcucumber59@gmail.com>
Date: Tue, 31 Oct 2023 08:26:58 -0400
Subject: [PATCH] Working With S3 Service

The plugin now seems to work with the S3 service.
---
 .../java/org/vcell/vcellfiji/N5ImageHandler.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java b/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java
index d28d167..1c62954 100644
--- a/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java
+++ b/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java
@@ -1,11 +1,13 @@
 package org.vcell.vcellfiji;
 
 
+import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.AnonymousAWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.AmazonS3URI;
 import ij.ImagePlus;
@@ -180,12 +182,23 @@ public void createS3Client(String url, HashMap<String, String> credentials, Hash
             this.s3ObjectKey = s3URI.getKey();
             this.bucketName = s3URI.getBucket();
             defaultRegion = s3URI.getRegion();
+            if(s3URI.isPathStyle()){
+                s3ClientBuilder.withPathStyleAccessEnabled(true);
+            }
         }
         // otherwise assume it is one of our URLs
+        // http://vcell:8000/bucket/object/object2
         catch (IllegalArgumentException e){
             String[] pathSubStrings = uri.getPath().split("/", 3);
             this.s3ObjectKey = pathSubStrings[2];
             this.bucketName = pathSubStrings[1];
+            s3ClientBuilder.withPathStyleAccessEnabled(true);
+            s3ClientBuilder.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(uri.getScheme() + "://" + uri.getAuthority(), defaultRegion));
+            if(credentials != null){
+                s3ClientBuilder.withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(credentials.get("AccessKey"), credentials.get("SecretKey"))));
+            }
+            this.s3Client = s3ClientBuilder.build();
+            return;
         }
 
         if(credentials != null){