[release] Set version to 2.49.1

multiapps-controller-api/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <dependencies>

multiapps-controller-client/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <dependencies>

multiapps-controller-core-test/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <dependencies>

multiapps-controller-core/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <dependencies>

multiapps-controller-coverage/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <build>

multiapps-controller-database-migration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <build>

multiapps-controller-persistence-test/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <dependencies>

multiapps-controller-persistence/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <build>

multiapps-controller-process/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <build>

multiapps-controller-shutdown-client/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <dependencies>

multiapps-controller-web/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>2.49.0</version>
+        <version>2.49.1</version>
     </parent>
 
     <build>

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Messages.java

@@ -57,7 +57,7 @@ public final class Messages {
 
     // WARN log messages
 
-    public static final String NO_OBJECTSTORE_PROVIDER_FOUND = "No ObjectStore provider found!";
+    public static final String NO_OBJECTSTORE_PROVIDER_FOUND_FOR_0 = "No ObjectStore provider found for {0}!";
 
     // INFO log messages
     public static final String ALM_SERVICE_ENV_INITIALIZED = "Deploy service environment initialized";

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java

@@ -23,7 +23,6 @@
 import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder;
 import org.cloudfoundry.multiapps.controller.web.Constants;
 import org.cloudfoundry.multiapps.controller.web.Messages;
-import org.cloudfoundry.multiapps.controller.web.configuration.service.ImmutableObjectStoreServiceInfo;
 import org.cloudfoundry.multiapps.controller.web.configuration.service.ObjectStoreServiceInfo;
 import org.cloudfoundry.multiapps.controller.web.configuration.service.ObjectStoreServiceInfoCreator;
 import org.jclouds.ContextBuilder;
@@ -92,11 +91,13 @@ public FileStorage createObjectStoreFromFirstReachableProvider(Map<String, Excep
     private Optional<FileStorage> createObjectStoreBasedOnProvider(String objectStoreProviderName,
                                                                    List<ObjectStoreServiceInfo> providersServiceInfo,
                                                                    Map<String, Exception> exceptions) {
-        return switch (objectStoreProviderName) {
-            case Constants.AZURE -> tryToCreateSdkObjectStore(exceptions, Constants.AZUREBLOB);
-            case Constants.GCP -> tryToCreateSdkObjectStore(exceptions, Constants.GOOGLE_CLOUD_STORAGE);
-            default -> tryToCreateJCloudsObjectStore(objectStoreProviderName, providersServiceInfo, exceptions);
-        };
+        Optional<ObjectStoreServiceInfo> objectStoreServiceInfoOptional = getAppropriateProvider(objectStoreProviderName,
+                                                                                                 providersServiceInfo);
+        if (objectStoreServiceInfoOptional.isEmpty()) {
+            LOGGER.warn(MessageFormat.format(Messages.NO_OBJECTSTORE_PROVIDER_FOUND_FOR_0, objectStoreProviderName));
+            return Optional.empty();
+        }
+        return tryToCreateObjectStore(objectStoreServiceInfoOptional.get(), exceptions);
     }
 
     private Optional<ObjectStoreServiceInfo> getAppropriateProvider(String objectStoreProviderName,
@@ -107,25 +108,6 @@ private Optional<ObjectStoreServiceInfo> getAppropriateProvider(String objectSto
                                    .findFirst();
     }
 
-    private Optional<FileStorage> tryToCreateJCloudsObjectStore(String objectStoreProviderName,
-                                                                List<ObjectStoreServiceInfo> providersServiceInfo,
-                                                                Map<String, Exception> exceptions) {
-        Optional<ObjectStoreServiceInfo> objectStoreServiceInfoOptional = getAppropriateProvider(objectStoreProviderName,
-                                                                                                 providersServiceInfo);
-        if (objectStoreServiceInfoOptional.isPresent()) {
-            ObjectStoreServiceInfo objectStoreServiceInfo = objectStoreServiceInfoOptional.get();
-            return tryToCreateObjectStore(objectStoreServiceInfo, exceptions);
-        }
-        LOGGER.warn(Messages.NO_OBJECTSTORE_PROVIDER_FOUND);
-        return Optional.empty();
-    }
-
-    private Optional<FileStorage> tryToCreateSdkObjectStore(Map<String, Exception> exceptions, String providerName) {
-        return tryToCreateObjectStore(ImmutableObjectStoreServiceInfo.builder()
-                                                                     .provider(providerName)
-                                                                     .build(), exceptions);
-    }
-
     private Optional<FileStorage> tryToCreateObjectStore(ObjectStoreServiceInfo objectStoreServiceInfo,
                                                          Map<String, Exception> exceptions) {
         try {

multiapps-controller-web/src/test/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBeanTest.java

@@ -15,6 +15,7 @@
 import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder;
 import org.cloudfoundry.multiapps.controller.web.Constants;
 import org.cloudfoundry.multiapps.controller.web.Messages;
+import org.cloudfoundry.multiapps.controller.web.configuration.service.ImmutableObjectStoreServiceInfo;
 import org.cloudfoundry.multiapps.controller.web.configuration.service.ObjectStoreServiceInfo;
 import org.cloudfoundry.multiapps.controller.web.configuration.service.ObjectStoreServiceInfoCreator;
 import org.jclouds.blobstore.BlobStoreContext;
@@ -59,6 +60,9 @@ class ObjectStoreFileStorageFactoryBeanTest {
     @Mock
     private AzureObjectStoreFileStorage azureObjectStoreFileStorage;
 
+    private ObjectStoreServiceInfo capturedGcpServiceInfo;
+    private ObjectStoreServiceInfo capturedAzureServiceInfo;
+
     @BeforeEach
     void setUp() throws Exception {
         MockitoAnnotations.openMocks(this)
@@ -149,6 +153,61 @@ void testObjectStoreCreationWhenEnvIsInvalid() {
             .createObjectStoreFromFirstReachableProvider(anyMap(), anyList());
     }
 
+    @Test
+    void testGcpFactoryReceivesPopulatedCredentialsWhenEnvIsGcp() {
+        mockCfService();
+        when(applicationConfiguration.getObjectStoreClientType()).thenReturn(Constants.GCP);
+
+        objectStoreFileStorageFactoryBean.afterPropertiesSet();
+
+        assertNotNull(capturedGcpServiceInfo);
+        assertEquals(Constants.GOOGLE_CLOUD_STORAGE, capturedGcpServiceInfo.getProvider());
+        assertNotNull(capturedGcpServiceInfo.getCredentials(),
+                      "GCP factory must receive an ObjectStoreServiceInfo carrying the bound credentials map");
+        assertEquals(ACCESS_KEY_ID_VALUE, capturedGcpServiceInfo.getCredentials()
+                                                                .get(Constants.ACCESS_KEY_ID));
+        assertEquals(BUCKET_VALUE, capturedGcpServiceInfo.getCredentials()
+                                                         .get(Constants.BUCKET));
+    }
+
+    @Test
+    void testAzureFactoryReceivesPopulatedCredentialsWhenEnvIsAzure() {
+        mockCfService();
+        when(applicationConfiguration.getObjectStoreClientType()).thenReturn(Constants.AZURE);
+
+        objectStoreFileStorageFactoryBean.afterPropertiesSet();
+
+        assertNotNull(capturedAzureServiceInfo);
+        assertEquals(Constants.AZUREBLOB, capturedAzureServiceInfo.getProvider());
+        assertNotNull(capturedAzureServiceInfo.getCredentials(),
+                      "Azure factory must receive an ObjectStoreServiceInfo carrying the bound credentials map");
+        assertEquals(SECRET_ACCESS_KEY_VALUE, capturedAzureServiceInfo.getCredentials()
+                                                                      .get(Constants.SECRET_ACCESS_KEY));
+    }
+
+    @Test
+    void testGcpEnvWithNoMatchingProviderInfoFallsThroughToNoValidStore() {
+        mockCfService();
+        when(applicationConfiguration.getObjectStoreClientType()).thenReturn(Constants.GCP);
+
+        ObjectStoreFileStorageFactoryBean bean = new ObjectStoreFileStorageFactoryBean("deploy-service-os", environmentServicesFinder,
+                                                                                       applicationConfiguration) {
+            @Override
+            public List<ObjectStoreServiceInfo> getProvidersServiceInfo() {
+                return List.of(ImmutableObjectStoreServiceInfo.builder()
+                                                              .provider(Constants.AWS_S_3)
+                                                              .identity(ACCESS_KEY_ID_VALUE)
+                                                              .credential(SECRET_ACCESS_KEY_VALUE)
+                                                              .container(BUCKET_VALUE)
+                                                              .build());
+            }
+        };
+
+        Exception exception = assertThrows(IllegalStateException.class, bean::afterPropertiesSet);
+        assertEquals(Messages.NO_VALID_OBJECT_STORE_CONFIGURATION_FOUND, exception.getMessage());
+        assertNull(capturedGcpServiceInfo, "GCP factory must not be invoked when no matching provider info is bound");
+    }
+
     @Test
     void testObjectStoreCreationWhenEnvProviderFailsToConnect() {
         mockCfService();
@@ -203,11 +262,13 @@ protected JCloudsObjectStoreFileStorage createFileStorage(ObjectStoreServiceInfo
 
         @Override
         protected GcpObjectStoreFileStorage createGcpFileStorage(ObjectStoreServiceInfo credentials) {
+            ObjectStoreFileStorageFactoryBeanTest.this.capturedGcpServiceInfo = credentials;
             return ObjectStoreFileStorageFactoryBeanTest.this.gcpObjectStoreFileStorage;
         }
 
         @Override
         protected AzureObjectStoreFileStorage createAzureFileStorage(ObjectStoreServiceInfo objectStoreServiceInfo) {
+            ObjectStoreFileStorageFactoryBeanTest.this.capturedAzureServiceInfo = objectStoreServiceInfo;
             return ObjectStoreFileStorageFactoryBeanTest.this.azureObjectStoreFileStorage;
         }
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cloudfoundry.multiapps</groupId>
     <artifactId>multiapps-controller-parent</artifactId>
-    <version>2.49.0</version>
+    <version>2.49.1</version>
     <packaging>pom</packaging>
     <name>MultiApps Controller Parent</name>
     <description>Multi-Target Application (MTA) deployment service for Cloud Foundry</description>