Fix failing deploy when ds can't resolve variables

cloudfoundry · Jan 30, 2025 · 008e1c7 · 008e1c7
1 parent 5abc8c1
commit 008e1c7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/...rg/cloudfoundry/multiapps/controller/core/helpers/v2/ConfigurationReferencesResolver.java b/...rg/cloudfoundry/multiapps/controller/core/helpers/v2/ConfigurationReferencesResolver.java
@@ -11,6 +11,7 @@
 import java.util.stream.Collectors;
 
 import org.cloudfoundry.multiapps.common.ContentException;
+import org.cloudfoundry.multiapps.common.util.MiscUtil;
 import org.cloudfoundry.multiapps.controller.core.Messages;
 import org.cloudfoundry.multiapps.controller.core.helpers.expander.PropertiesExpander;
 import org.cloudfoundry.multiapps.controller.core.model.ResolvedConfigurationReference;
@@ -121,7 +122,12 @@ protected List<RequiredDependency> expandRequiredDependencyIfNecessary(Propertie
         }
 
         if (!permitsMultipleResources(dependency)) {
-            makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
+            if (dependencyOwner instanceof Resource) {
+                Resource resource = MiscUtil.cast(dependencyOwner);
+                makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources(), resource.isOptional());
+            } else {
+                makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources(), false);
+            }
             return Collections.singletonList(dependency);
         }
 
@@ -139,7 +145,11 @@ protected List<RequiredDependency> expandRequiredDependencyIfNecessary(Propertie
         return expandedDependencies;
     }
 
-    protected void makeSureIsResolvedToSingleResource(String resolvedResourceName, List<Resource> resultingResources) {
+    protected void makeSureIsResolvedToSingleResource(String resolvedResourceName, List<Resource> resultingResources,
+                                                      boolean isResourceOptional) {
+        if (isResourceOptional) {
+            return;
+        }
         if (resultingResources.size() > 1) {
             throw new ContentException(format(Messages.MULTIPLE_CONFIGURATION_ENTRIES_WERE_FOUND, resolvedResourceName));
         } else if (resultingResources.isEmpty()) {

diff --git a/...rg/cloudfoundry/multiapps/controller/core/helpers/v3/ConfigurationReferencesResolver.java b/...rg/cloudfoundry/multiapps/controller/core/helpers/v3/ConfigurationReferencesResolver.java
@@ -7,6 +7,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.cloudfoundry.multiapps.common.util.MiscUtil;
 import org.cloudfoundry.multiapps.controller.core.helpers.expander.PropertiesExpander;
 import org.cloudfoundry.multiapps.controller.core.helpers.v2.ConfigurationFilterParser;
 import org.cloudfoundry.multiapps.controller.core.model.ResolvedConfigurationReference;
@@ -71,7 +72,12 @@ protected List<RequiredDependency> expandRequiredDependencyIfNecessary(Propertie
         }
 
         if (!permitsMultipleResources(dependency)) {
-            makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
+            if (dependencyOwner instanceof Resource) {
+                Resource resource = MiscUtil.cast(dependencyOwner);
+                makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources(), resource.isOptional());
+            } else {
+                makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources(), false);
+            }
             return Collections.singletonList(dependency);
         }