Use provided bucket name when available.

Author: dkocher

hub/src/test/java/cloud/katta/core/AbstractHubSynchronizeTest.java

@@ -61,7 +61,6 @@
 import cloud.katta.client.api.StorageProfileResourceApi;
 import cloud.katta.client.api.UsersResourceApi;
 import cloud.katta.client.model.ConfigDto;
-import cloud.katta.client.model.Protocol;
 import cloud.katta.client.model.S3SERVERSIDEENCRYPTION;
 import cloud.katta.client.model.S3STORAGECLASSES;
 import cloud.katta.client.model.StorageProfileDto;
@@ -234,7 +233,7 @@ public void test03AddVault(final HubTestConfig config) throws Exception {
             log.info("Creating vault in {}", hubSession);
             final UUID vaultId = UUID.fromString(new UUIDRandomStringService().random());
 
-            final Path bucket = new Path(storageProfileWrapper.getProtocol() == Protocol.S3_STS ? storageProfileWrapper.getBucketPrefix() + vaultId : config.vault.bucketName,
+            final Path bucket = new Path(null == config.vault.bucketName ? storageProfileWrapper.getBucketPrefix() + vaultId : config.vault.bucketName,
                     EnumSet.of(Path.Type.volume, Path.Type.directory));
             final HubStorageLocationService.StorageLocation location = new HubStorageLocationService.StorageLocation(storageProfileWrapper.getId().toString(), storageProfileWrapper.getRegion(),
                     storageProfileWrapper.getName());

hub/src/test/java/cloud/katta/workflows/AbstractHubWorkflowTest.java

@@ -24,7 +24,6 @@
 import cloud.katta.client.api.UsersResourceApi;
 import cloud.katta.client.api.VaultResourceApi;
 import cloud.katta.client.model.MemberDto;
-import cloud.katta.client.model.Protocol;
 import cloud.katta.client.model.Role;
 import cloud.katta.client.model.StorageProfileDto;
 import cloud.katta.client.model.UserDto;
@@ -64,7 +63,7 @@ public void testHubWorkflow(final HubTestConfig config) throws Exception {
                     .filter(p -> p.getId().toString().equals(config.vault.storageProfileId.toLowerCase())).findFirst().get();
 
             final UUID vaultId = UUID.fromString(new UUIDRandomStringService().random());
-            final Path bucket = new Path(storageProfileWrapper.getProtocol() == Protocol.S3_STS ? storageProfileWrapper.getBucketPrefix() + vaultId : config.vault.bucketName,
+            final Path bucket = new Path(null == config.vault.bucketName ? storageProfileWrapper.getBucketPrefix() + vaultId : config.vault.bucketName,
                     EnumSet.of(Path.Type.volume, Path.Type.directory));
             final HubStorageLocationService.StorageLocation location = new HubStorageLocationService.StorageLocation(storageProfileWrapper.getId().toString(), storageProfileWrapper.getRegion(),
                     storageProfileWrapper.getName());