Delete service keys after deploy

Author: Yavor16

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

@@ -140,6 +140,7 @@ public class SupportedParameters {
     public static final String NAME = "name";
     public static final String SERVICE_KEY_CONFIG = "config";
     public static final String SERVICE_KEY_NAME = "service-key-name";
+    public static final String DELETE_SERVICE_KEY_AFTER_DEPLOYMENT = "delete-service-key-after-deployment";
     public static final String DEFAULT_CONTAINER_NAME = "default-container-name";
     public static final String DEFAULT_XS_APP_NAME = "default-xsappname";
     public static final String TYPE = "type";

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

@@ -188,10 +188,15 @@ private void setComponentsToUndeploy(ProcessContext context, List<String> servic
         context.setVariable(Variables.SUBSCRIPTIONS_TO_DELETE, subscriptions);
         context.setVariable(Variables.SERVICES_TO_DELETE, services);
         context.setVariable(Variables.APPS_TO_UNDEPLOY, apps);
-        context.setVariable(Variables.SERVICE_KEYS_TO_DELETE, serviceKeys);
+        context.setVariable(Variables.SERVICE_KEYS_TO_DELETE, getServiceKeysToDelete(context, serviceKeys));
         context.setVariable(Variables.APPS_TO_BACKUP, appsToBackup);
     }
 
+    private List<DeployedMtaServiceKey> getServiceKeysToDelete(ProcessContext context, List<DeployedMtaServiceKey> serviceKeys) {
+        List<DeployedMtaServiceKey> scheduledServiceKeysForDeletion = context.getVariable(Variables.SERVICE_KEYS_TO_DELETE);
+        return ListUtils.union(scheduledServiceKeysForDeletion, serviceKeys);
+    }
+
     private List<String> computeServicesToDelete(ProcessContext context, List<DeployedMtaApplication> appsWithoutChange,
                                                  List<DeployedMtaService> deployedMtaServices, Set<String> servicesForApplications,
                                                  List<String> servicesForCurrentDeployment) {