Move enable-ssh overridde in staging parser

Author: theghost5800

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/parser/StagingParametersParser.java

@@ -2,6 +2,7 @@
 
 import java.text.MessageFormat;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -10,6 +11,7 @@
 import com.sap.cloudfoundry.client.facade.domain.LifecycleType;
 import com.sap.cloudfoundry.client.facade.domain.Staging;
 import org.cloudfoundry.multiapps.common.ContentException;
+import org.cloudfoundry.multiapps.controller.core.Constants;
 import org.cloudfoundry.multiapps.controller.core.model.SupportedParameters;
 import org.cloudfoundry.multiapps.mta.util.PropertiesUtil;
 import org.springframework.util.CollectionUtils;
@@ -43,6 +45,10 @@ public Staging parse(List<Map<String, Object>> parametersList) {
         Map<String, Boolean> appFeatures = (Map<String, Boolean>) PropertiesUtil.getPropertyValue(parametersList,
                                                                                                   SupportedParameters.APP_FEATURES,
                                                                                                   Collections.emptyMap());
+        Map<String, Boolean> appFeaturesWithOverriddenSsh = new HashMap<>(appFeatures);
+        if (isSshEnabled != null && !appFeatures.containsKey(Constants.APP_FEATURE_SSH)) {
+            appFeaturesWithOverriddenSsh.put(Constants.APP_FEATURE_SSH, isSshEnabled);
+        }
         DockerInfo dockerInfo = new DockerInfoParser().parse(parametersList);
         LifecycleType lifecycleType = parseLifecycleType(parametersList);
 
@@ -57,7 +63,7 @@ public Staging parse(List<Map<String, Object>> parametersList) {
                                .healthCheckType(healthCheckType)
                                .healthCheckHttpEndpoint(healthCheckHttpEndpoint)
                                .isSshEnabled(isSshEnabled)
-                               .appFeatures(appFeatures)
+                               .appFeatures(appFeaturesWithOverriddenSsh)
                                .dockerInfo(dockerInfo)
                                .lifecycleType(lifecycleType)
                                .build();

multiapps-controller-core/src/test/resources/org/cloudfoundry/multiapps/controller/core/cf/v2/apps-with-ssh-enabled-false.json

@@ -20,7 +20,9 @@
     "staging": {
       "isSshEnabled": false,
       "buildpacks": [],
-      "appFeatures": {}
+      "appFeatures": {
+        "ssh": false
+      }
     },
     "routes": [
       {

multiapps-controller-core/src/test/resources/org/cloudfoundry/multiapps/controller/core/cf/v2/apps-with-ssh-enabled-true.json

@@ -20,7 +20,9 @@
     "staging": {
       "isSshEnabled": true,
       "buildpacks": [],
-      "appFeatures": {}
+      "appFeatures": {
+        "ssh": true
+      }
     },
     "routes": [
       {

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/util/StagingApplicationAttributeUpdater.java

@@ -1,6 +1,5 @@
 package org.cloudfoundry.multiapps.controller.process.util;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -11,7 +10,6 @@
 import org.cloudfoundry.multiapps.controller.client.lib.domain.CloudApplicationExtended;
 import org.cloudfoundry.multiapps.controller.client.lib.domain.DropletInfoFactory;
 import org.cloudfoundry.multiapps.controller.client.lib.domain.HealthCheckInfo;
-import org.cloudfoundry.multiapps.controller.core.Constants;
 import org.cloudfoundry.multiapps.controller.process.steps.ProcessContext;
 import org.cloudfoundry.multiapps.controller.process.util.ElementUpdater.UpdateStrategy;
 import org.cloudfoundry.multiapps.controller.process.variables.Variables;
@@ -39,11 +37,6 @@ private boolean hasStagingChanged(Staging staging, CloudApplication existingApp,
         String command = staging.getCommand();
         var healthCheck = HealthCheckInfo.fromStaging(staging);
         var existingHealthCheck = HealthCheckInfo.fromProcess(existingProcess);
-        Map<String, Boolean> appFeaturesWithOverriddenSsh = new HashMap<>(staging.getAppFeatures());
-        if (staging.isSshEnabled() != null && !staging.getAppFeatures()
-                                                      .containsKey(Constants.APP_FEATURE_SSH)) {
-            appFeaturesWithOverriddenSsh.put(Constants.APP_FEATURE_SSH, staging.isSshEnabled());
-        }
         var dropletInfo = dropletInfoFactory.createDropletInfo(staging);
         var existingDropletInfo = dropletInfoFactory.createDropletInfo(existingApp, getControllerClient());