Handle backup applications when switch from old to new blue green

Author: theghost5800

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/BlueGreenApplicationNameSuffix.java

@@ -25,11 +25,25 @@ public static boolean isSuffixContainedIn(String name) {
                      .anyMatch(name::endsWith);
     }
 
+    public static boolean isLiveIdleSuffixContainedIn(String name) {
+        return Stream.of(LIVE, IDLE)
+                     .map(BlueGreenApplicationNameSuffix::asSuffix)
+                     .anyMatch(name::endsWith);
+    }
+
     public static String removeSuffix(String name) {
         if (isSuffixContainedIn(name)) {
             return name.substring(0, name.lastIndexOf('-'));
         }
         return name;
     }
 
+    public static String removeDoubleSuffixes(String name) {
+        String newName = name;
+        while (isSuffixContainedIn(newName)) {
+            newName = newName.substring(0, newName.lastIndexOf('-'));
+        }
+        return newName;
+    }
+
 }

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/DetectApplicationsToRenameStep.java

@@ -6,8 +6,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jakarta.inject.Named;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.cloudfoundry.multiapps.controller.core.model.BlueGreenApplicationNameSuffix;
 import org.cloudfoundry.multiapps.controller.core.model.DeployedMta;
@@ -23,6 +21,8 @@
 import com.sap.cloudfoundry.client.facade.CloudControllerClient;
 import com.sap.cloudfoundry.client.facade.domain.CloudApplication;
 
+import jakarta.inject.Named;
+
 @Named("detectApplicationsToRenameStep")
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
 public class DetectApplicationsToRenameStep extends SyncFlowableStep {
@@ -54,7 +54,7 @@ protected StepPhase executeStep(ProcessContext context) {
     private List<String> computeOldAppsToRename(DeployedMta deployedMta, List<String> selectedModules) {
         return deployedMta.getApplications()
                           .stream()
-                          .filter(app -> !BlueGreenApplicationNameSuffix.isSuffixContainedIn(app.getName()))
+                          .filter(app -> !BlueGreenApplicationNameSuffix.isLiveIdleSuffixContainedIn(app.getName()))
                           .filter(app -> isModuleSelectedForDeployment(app.getModuleName(), selectedModules))
                           .map(DeployedMtaApplication::getName)
                           .collect(Collectors.toList());

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/PrepareApplicationForBackupStep.java

@@ -31,7 +31,7 @@ protected StepPhase executeStep(ProcessContext context) throws Exception {
         String mtaUserNamespaceWithSystemNamespace = NameUtil.computeUserNamespaceWithSystemNamespace(Constants.MTA_BACKUP_NAMESPACE,
                                                                                                       mtaNamespace);
 
-        String newApplicationName = BlueGreenApplicationNameSuffix.removeSuffix(cloudApplication.getName());
+        String newApplicationName = BlueGreenApplicationNameSuffix.removeDoubleSuffixes(cloudApplication.getName());
         newApplicationName = NameUtil.computeValidApplicationName(newApplicationName, Constants.MTA_BACKUP_NAMESPACE, true, false);
 
         getStepLogger().info(Messages.RENAMING_APPLICATION_0_TO_1_TO_BE_USED_FOR_ROLLBACK, cloudApplication.getName(), newApplicationName);