Revert "remove idle suffix from bg deploy (#1697)" (#1765)

ikasarov · web-flow · commit ef849d9fc371 · 2026-01-19T10:48:15.000+02:00
This reverts commit 9e41603.
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java
@@ -178,7 +178,7 @@ public final class Messages {
     public static final String THREAD_MONITOR_CACHE_TIMEOUT = "Flowable thread monitor cache timeout: {0} seconds";
     public static final String SPACE_DEVELOPERS_CACHE_TIME_IN_SECONDS = "Cache for list of space developers per SpaceGUID: {0} seconds";
     public static final String APP_SHUTDOWN_REQUEST = "Application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\", is requested to shutdown. Timeout to wait before shutdown of Flowable job executor:\"{3}\" seconds.";
-    public static final String APP_SUCCESSFULLY_SHUTDOWN = "Application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\", is shutdown. Timeout to wait before shutdown of Flowable job executor:\"{3}\" seconds.";
+    public static final String APP_SHUTDOWNED = "Application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\", is shutdowned. Timeout to wait before shutdown of Flowable job executor:\"{3}\" seconds.";
     public static final String APP_SHUTDOWN_STATUS_MONITOR = "Monitor shutdown status of application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\". Status:\"{3}\".";
     public static final String CONTROLLER_CLIENT_SSL_HANDSHAKE_TIMEOUT_IN_SECONDS = "Controller client SSL handshake timeout in seconds: {0}";
     public static final String CONTROLLER_CLIENT_CONNECT_TIMEOUT_IN_SECONDS = "Controller client connect timeout in seconds: {0}";
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminer.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminer.java
@@ -10,7 +10,7 @@ public AppSuffixDeterminer(boolean keepOriginalNamesAfterDeploy, boolean isAfter
         this.isAfterResumePhase = isAfterResumePhase;
     }
 
-    public boolean shouldAppendIdleSuffix() {
+    public boolean shouldAppendApplicationSuffix() {
         return keepOriginalNamesAfterDeploy && isAfterResumePhase;
     }
 }
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ApplicationCloudModelBuilder.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ApplicationCloudModelBuilder.java
@@ -152,7 +152,7 @@ private DeployedMtaApplication findDeployedApplication(String moduleName, Deploy
 
     private String getApplicationName(Module module) {
         String applicationName = NameUtil.getApplicationName(module);
-        if (appSuffixDeterminer.shouldAppendIdleSuffix()) {
+        if (appSuffixDeterminer.shouldAppendApplicationSuffix()) {
             applicationName += BlueGreenApplicationNameSuffix.IDLE.asSuffix();
         }
         return applicationName;
diff --git a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminerTest.java b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminerTest.java
@@ -1,17 +1,18 @@
 package org.cloudfoundry.multiapps.controller.core.cf.detect;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.stream.Stream;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AppSuffixDeterminerTest {
 
     static Stream<Arguments> testAppSuffixDeterminer() {
         return Stream.of(
+        //@formatter:off
             // (1) Keep original app names is not set and the process is not after resume phase
             Arguments.of(false, false, false),
             // (2) Keep original app names is set but the process is not after resume phase
@@ -20,13 +21,14 @@ static Stream<Arguments> testAppSuffixDeterminer() {
             Arguments.of(false, true, false),
             // (4) Keep original app names is set and the process is after resume phase
             Arguments.of(true, true, true)
+        //@formatter:on
         );
     }
 
     @ParameterizedTest
     @MethodSource
     void testAppSuffixDeterminer(boolean keepOriginalNamesAfterDeploy, boolean isAfterResumePhase, boolean shouldAppendApplicationSuffix) {
         AppSuffixDeterminer appSuffixDeterminer = new AppSuffixDeterminer(keepOriginalNamesAfterDeploy, isAfterResumePhase);
-        assertEquals(shouldAppendApplicationSuffix, appSuffixDeterminer.shouldAppendIdleSuffix());
+        assertEquals(shouldAppendApplicationSuffix, appSuffixDeterminer.shouldAppendApplicationSuffix());
     }
 }
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java
@@ -161,6 +161,7 @@ public class Messages {
     public static final String ERROR_MONITORING_OPERATIONS_OVER_SERVICES = "Error monitoring operations over services";
     public static final String ERROR_DELETING_REMAINING_FILE_PARTS = "Error deleting remaining file parts";
     public static final String ERROR_DETECTING_APPLICATIONS_TO_RENAME = "Error detecting applications to rename";
+    public static final String ERROR_RENAMING_NEW_APPLICATIONS = "Error renaming new applications";
     public static final String ERROR_MONITORING_CREATION_OR_UPDATE_OF_SERVICES = "Error monitoring creation or update of services";
     public static final String ERROR_MONITORING_DELETION_OF_SERVICES = "Error monitoring deletion of services";
     public static final String SERVICE_IS_ALREADY_DELETED = "Service \"{0}\" is already deleted";
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java
@@ -18,7 +18,6 @@
 import org.cloudfoundry.multiapps.controller.client.facade.CloudControllerClient;
 import org.cloudfoundry.multiapps.controller.client.facade.CloudCredentials;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.CloudApplication;
-import org.cloudfoundry.multiapps.controller.client.facade.domain.ImmutableCloudApplication;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.ImmutableStaging;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.Staging;
 import org.cloudfoundry.multiapps.controller.client.facade.dto.ApplicationToCreateDto;
@@ -29,11 +28,8 @@
 import org.cloudfoundry.multiapps.controller.core.cf.clients.AppBoundServiceInstanceNamesGetter;
 import org.cloudfoundry.multiapps.controller.core.cf.clients.WebClientFactory;
 import org.cloudfoundry.multiapps.controller.core.helpers.ApplicationFileDigestDetector;
-import org.cloudfoundry.multiapps.controller.core.model.BlueGreenApplicationNameSuffix;
 import org.cloudfoundry.multiapps.controller.core.security.token.TokenService;
 import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
-import org.cloudfoundry.multiapps.controller.persistence.model.ConfigurationSubscription;
-import org.cloudfoundry.multiapps.controller.persistence.services.ConfigurationSubscriptionService;
 import org.cloudfoundry.multiapps.controller.persistence.services.FileStorageException;
 import org.cloudfoundry.multiapps.controller.process.Messages;
 import org.cloudfoundry.multiapps.controller.process.util.ApplicationAttributeUpdater;
@@ -63,8 +59,6 @@ public class CreateOrUpdateAppStep extends SyncFlowableStep {
     private WebClientFactory webClientFactory;
     @Inject
     private ApplicationConfiguration configuration;
-    @Inject
-    private ConfigurationSubscriptionService subscriptionService;
 
     @Override
     protected StepPhase executeStep(ProcessContext context) throws FileStorageException {
@@ -100,9 +94,7 @@ protected AppBoundServiceInstanceNamesGetter getAppBoundServiceInstanceNamesGett
         return new AppBoundServiceInstanceNamesGetter(configuration, webClientFactory, credentials, correlationId);
     }
 
-    private StepFlowHandler createStepFlowHandler(ProcessContext context,
-                                                  CloudControllerClient client,
-                                                  CloudApplicationExtended app,
+    private StepFlowHandler createStepFlowHandler(ProcessContext context, CloudControllerClient client, CloudApplicationExtended app,
                                                   CloudApplication existingApp) {
         if (existingApp == null) {
             return new CreateAppFlowHandler(context, client, app);
@@ -220,9 +212,7 @@ private class UpdateAppFlowHandler extends StepFlowHandler {
 
         final CloudApplication existingApp;
 
-        public UpdateAppFlowHandler(ProcessContext context,
-                                    CloudControllerClient client,
-                                    CloudApplicationExtended app,
+        public UpdateAppFlowHandler(ProcessContext context, CloudControllerClient client, CloudApplicationExtended app,
                                     CloudApplication existingApp) {
             super(context, client, app);
             this.existingApp = existingApp;
@@ -240,9 +230,7 @@ public void handleApplicationAttributes() {
 
             reportApplicationUpdateStatus(app, arePropertiesChanged);
             context.setVariable(Variables.VCAP_APP_PROPERTIES_CHANGED, arePropertiesChanged);
-
             updateApplicationEnvironment();
-            updateApplicationName();
         }
 
         private void updateApplicationEnvironment() {
@@ -290,31 +278,6 @@ private UpdateStrategy getEnvUpdateStrategy() {
                       .shouldKeepExistingEnv() ? UpdateStrategy.MERGE : UpdateStrategy.REPLACE;
         }
 
-        public void updateApplicationName() {
-            boolean processIsBlueGreenWithIdleSuffix = StepsUtil.getAppSuffixDeterminer(context)
-                                                                .shouldAppendIdleSuffix();
-            if (!processIsBlueGreenWithIdleSuffix) {
-                return;
-            }
-
-            String oldName = existingApp.getName();
-            String newName = BlueGreenApplicationNameSuffix.removeSuffix(oldName);
-            if (oldName.equals(newName)) {
-                getStepLogger().info(Messages.THE_DETECTED_APPLICATION_HAS_THE_SAME_NAME_AS_THE_NEW_ONE);
-                return;
-            }
-
-            getStepLogger().info(Messages.RENAMING_APPLICATION_0_TO_1, oldName, newName);
-            client.rename(oldName, newName);
-
-            context.setVariable(Variables.EXISTING_APP, ImmutableCloudApplication.copyOf(existingApp)
-                                                                                 .withName(newName));
-            context.setVariable(Variables.APP_TO_PROCESS, ImmutableCloudApplicationExtended.copyOf(app)
-                                                                                           .withName(newName));
-
-            updateConfigurationSubscribers(oldName, newName);
-        }
-
         @Override
         public void handleApplicationServices() {
             if (context.getVariable(Variables.SHOULD_SKIP_SERVICE_REBINDING)) {
@@ -334,40 +297,6 @@ public void printStepEndMessage() {
             getStepLogger().debug(Messages.APP_UPDATED, app.getName());
         }
 
-        private void updateConfigurationSubscribers(String oldAppName, String newAppName) {
-            String mtaId = context.getVariable(Variables.MTA_ID);
-            String spaceGuid = context.getVariable(Variables.SPACE_GUID);
-
-            List<ConfigurationSubscription> subscriptions = subscriptionService.createQuery()
-                                                                               .mtaId(mtaId)
-                                                                               .spaceId(spaceGuid)
-                                                                               .list();
-            for (ConfigurationSubscription subscription : subscriptions) {
-                if (oldAppName.equals(subscription.getAppName())) {
-                    getStepLogger().debug(Messages.UPDATING_CONFIGURATION_SUBSCRIPTION_0_WITH_NAME_1, subscription.getAppName(),
-                                          newAppName);
-                    updateConfigurationSubscription(subscription, newAppName);
-                }
-            }
-        }
-
-        private void updateConfigurationSubscription(ConfigurationSubscription subscription, String newAppName) {
-            ConfigurationSubscription newSubscription = createNewSubscription(subscription, newAppName);
-            subscriptionService.update(subscription, newSubscription);
-        }
-
-        private ConfigurationSubscription createNewSubscription(ConfigurationSubscription subscription, String newAppName) {
-            return new ConfigurationSubscription(subscription.getId(),
-                                                 subscription.getMtaId(),
-                                                 subscription.getSpaceId(),
-                                                 newAppName,
-                                                 subscription.getFilter(),
-                                                 subscription.getModuleDto(),
-                                                 subscription.getResourceDto(),
-                                                 subscription.getModuleId(),
-                                                 subscription.getResourceId());
-        }
-
         private List<String> getMtaAndExistingServices() {
             var serviceNamesGetter = getAppBoundServiceInstanceNamesGetter(context);
             return Stream.of(app.getServices(), serviceNamesGetter.getServiceInstanceNamesBoundToApp(existingApp.getGuid()))
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStep.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStep.java
@@ -0,0 +1,75 @@
+package org.cloudfoundry.multiapps.controller.process.steps;
+
+import java.util.List;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import org.cloudfoundry.multiapps.controller.client.facade.CloudControllerClient;
+import org.cloudfoundry.multiapps.controller.core.model.BlueGreenApplicationNameSuffix;
+import org.cloudfoundry.multiapps.controller.persistence.model.ConfigurationSubscription;
+import org.cloudfoundry.multiapps.controller.persistence.services.ConfigurationSubscriptionService;
+import org.cloudfoundry.multiapps.controller.process.Messages;
+import org.cloudfoundry.multiapps.controller.process.variables.Variables;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Scope;
+
+@Named("removeNewApplicationsSuffixStep")
+@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+public class RemoveNewApplicationsSuffixStep extends SyncFlowableStep {
+
+    @Inject
+    private ConfigurationSubscriptionService subscriptionService;
+
+    @Override
+    protected StepPhase executeStep(ProcessContext context) {
+        if (!context.getVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY)) {
+            return StepPhase.DONE;
+        }
+
+        List<String> appsToProcess = context.getVariable(Variables.APPS_TO_DEPLOY);
+        CloudControllerClient client = context.getControllerClient();
+
+        for (String appName : appsToProcess) {
+            String newName = BlueGreenApplicationNameSuffix.removeSuffix(appName);
+            getStepLogger().info(Messages.RENAMING_APPLICATION_0_TO_1, appName, newName);
+            client.rename(appName, newName);
+        }
+
+        String mtaId = context.getVariable(Variables.MTA_ID);
+        String spaceId = context.getVariable(Variables.SPACE_GUID);
+        updateConfigurationSubscribers(appsToProcess, mtaId, spaceId);
+
+        return StepPhase.DONE;
+    }
+
+    private void updateConfigurationSubscribers(List<String> appsToProcess, String mtaId, String spaceId) {
+        List<ConfigurationSubscription> subscriptions = subscriptionService.createQuery()
+                                                                           .mtaId(mtaId)
+                                                                           .spaceId(spaceId)
+                                                                           .list();
+        for (ConfigurationSubscription subscription : subscriptions) {
+            if (appsToProcess.contains(subscription.getAppName())) {
+                String newAppName = BlueGreenApplicationNameSuffix.removeSuffix(subscription.getAppName());
+                getStepLogger().debug(Messages.UPDATING_CONFIGURATION_SUBSCRIPTION_0_WITH_NAME_1, subscription.getAppName(), newAppName);
+                updateConfigurationSubscription(subscription, newAppName);
+            }
+        }
+    }
+
+    private void updateConfigurationSubscription(ConfigurationSubscription subscription, String newAppName) {
+        ConfigurationSubscription newSubscription = createNewSubscription(subscription, newAppName);
+        subscriptionService.update(subscription, newSubscription);
+    }
+
+    private ConfigurationSubscription createNewSubscription(ConfigurationSubscription subscription, String newAppName) {
+        return new ConfigurationSubscription(subscription.getId(), subscription.getMtaId(), subscription.getSpaceId(), newAppName,
+                                             subscription.getFilter(), subscription.getModuleDto(), subscription.getResourceDto(),
+                                             subscription.getModuleId(), subscription.getResourceId());
+    }
+
+    @Override
+    protected String getStepErrorMessage(ProcessContext context) {
+        return Messages.ERROR_RENAMING_NEW_APPLICATIONS;
+    }
+
+}
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java
@@ -216,7 +216,7 @@ static ApplicationCloudModelBuilder getApplicationCloudModelBuilder(ProcessConte
                                                               shouldApplyIncrementalInstancesUpdate(context));
     }
 
-    public static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {
+    static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {
         boolean keepOriginalNamesAfterDeploy = context.getVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY);
         boolean isAfterResumePhase = context.getVariable(Variables.PHASE) == Phase.AFTER_RESUME;
         return new AppSuffixDeterminer(keepOriginalNamesAfterDeploy, isAfterResumePhase);
diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn
diff --git a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateStepWithExistingAppTest.java b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateStepWithExistingAppTest.java
diff --git a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStepTest.java b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStepTest.java
diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ApplicationShutdownResource.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ApplicationShutdownResource.java

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public AppSuffixDeterminer(boolean keepOriginalNamesAfterDeploy, boolean isAfter`
`10`	`10`	`this.isAfterResumePhase = isAfterResumePhase;`
`11`	`11`	`}`
`12`	`12`
`13`		`- public boolean shouldAppendIdleSuffix() {`
	`13`	`+ public boolean shouldAppendApplicationSuffix() {`
`14`	`14`	`return keepOriginalNamesAfterDeploy && isAfterResumePhase;`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ private DeployedMtaApplication findDeployedApplication(String moduleName, Deploy`
`152`	`152`
`153`	`153`	`private String getApplicationName(Module module) {`
`154`	`154`	`String applicationName = NameUtil.getApplicationName(module);`
`155`		`- if (appSuffixDeterminer.shouldAppendIdleSuffix()) {`
	`155`	`+ if (appSuffixDeterminer.shouldAppendApplicationSuffix()) {`
`156`	`156`	`applicationName += BlueGreenApplicationNameSuffix.IDLE.asSuffix();`
`157`	`157`	`}`
`158`	`158`	`return applicationName;`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ static ApplicationCloudModelBuilder getApplicationCloudModelBuilder(ProcessConte`
`216`	`216`	`shouldApplyIncrementalInstancesUpdate(context));`
`217`	`217`	`}`
`218`	`218`
`219`		`- public static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {`
	`219`	`+ static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {`
`220`	`220`	`boolean keepOriginalNamesAfterDeploy = context.getVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY);`
`221`	`221`	`boolean isAfterResumePhase = context.getVariable(Variables.PHASE) == Phase.AFTER_RESUME;`
`222`	`222`	`return new AppSuffixDeterminer(keepOriginalNamesAfterDeploy, isAfterResumePhase);`