From c88072b8eff5f8b2984eaaad7707ae74f47a5bc5 Mon Sep 17 00:00:00 2001 From: Maciej Date: Wed, 6 Mar 2019 15:26:43 +0100 Subject: [PATCH] Do not eagerly initialize BlobStore This prevents OpenStack blobstores from matching regions incorrectly, basing on a value of the endpoint variable. OVH has different URLs for each storage endpoint, which does not match the auth endpoint. --- src/main/java/org/gaul/s3proxy/Main.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gaul/s3proxy/Main.java b/src/main/java/org/gaul/s3proxy/Main.java index ae85dc0..546b394 100644 --- a/src/main/java/org/gaul/s3proxy/Main.java +++ b/src/main/java/org/gaul/s3proxy/Main.java @@ -310,11 +310,13 @@ public final class Main { } BlobStoreContext context = builder.build(BlobStoreContext.class); - BlobStore blobStore = context.getBlobStore(); + BlobStore blobStore; if (context instanceof RegionScopedBlobStoreContext && region != null) { blobStore = ((RegionScopedBlobStoreContext) context) .getBlobStore(region); + } else { + blobStore = context.getBlobStore(); } return blobStore; }