From e069b195f98a6215585a816628dae996325106df Mon Sep 17 00:00:00 2001 From: stiv03 Date: Thu, 17 Jul 2025 16:47:14 +0300 Subject: [PATCH 1/2] fix UPS defined as existing service resources are not working LMCROSSITXSADEPLOY-2524 --- .../controller/core/util/CloudModelBuilderUtil.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java index 50c59495e3..5d62c1b427 100644 --- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java +++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java @@ -7,6 +7,8 @@ import java.util.TreeSet; import java.util.stream.Collectors; +import com.sap.cloudfoundry.client.facade.CloudControllerClient; +import com.sap.cloudfoundry.client.facade.domain.CloudServiceInstance; import org.cloudfoundry.multiapps.controller.core.cf.v2.ResourceType; import org.cloudfoundry.multiapps.controller.core.model.ApplicationColor; import org.cloudfoundry.multiapps.controller.core.model.DeployedMtaApplication; @@ -76,6 +78,11 @@ public static ResourceType getResourceType(Map properties) { return ResourceType.get(type); } + public static boolean isExistingUserProvidedService(Resource resource, CloudControllerClient client) { + CloudServiceInstance serviceInstance = client.getServiceInstance(NameUtil.getServiceName(resource)); + return serviceInstance.isUserProvided(); + } + private static ResourceType getResourceType(Resource resource) { Map resourceParameters = resource.getParameters(); String type = (String) resourceParameters.get(SupportedParameters.TYPE); From ec7d87a302233b15f5b5e11efd76c40391a6cf81 Mon Sep 17 00:00:00 2001 From: stiv03 Date: Tue, 12 Aug 2025 13:56:45 +0300 Subject: [PATCH 2/2] fix imports --- .../multiapps/controller/core/util/CloudModelBuilderUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java index 5d62c1b427..4a23ce300d 100644 --- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java +++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/CloudModelBuilderUtil.java @@ -7,8 +7,8 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import com.sap.cloudfoundry.client.facade.CloudControllerClient; -import com.sap.cloudfoundry.client.facade.domain.CloudServiceInstance; +import org.cloudfoundry.multiapps.controller.client.facade.CloudControllerClient; +import org.cloudfoundry.multiapps.controller.client.facade.domain.CloudServiceInstance; import org.cloudfoundry.multiapps.controller.core.cf.v2.ResourceType; import org.cloudfoundry.multiapps.controller.core.model.ApplicationColor; import org.cloudfoundry.multiapps.controller.core.model.DeployedMtaApplication;