fix: check for optional sibling only if ref is unsatisfied

kubeshop · Oct 11, 2021 · 451b19f · 451b19f
1 parent f28705a
commit 451b19f
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/src/redux/services/resourceRefs.ts b/src/redux/services/resourceRefs.ts
@@ -235,19 +235,6 @@ function handleRefMappingByKey(
   }
 
   sourceRefNodes.forEach(sourceRefNode => {
-    if (outgoingRefMapper.source.hasOptionalSibling) {
-      const optionalSiblingPath = joinPathParts([...outgoingRefMapper.source.pathParts.slice(0, -1), 'optional']);
-
-      const optionalSiblingRefNode = sourceResource.refNodesByPath
-        ? sourceResource.refNodesByPath[optionalSiblingPath]?.find(refNode =>
-            refNode.parentKeyPath.startsWith(sourceRefNode.parentKeyPath)
-          )
-        : undefined;
-      if (optionalSiblingRefNode && optionalSiblingRefNode.scalar.value === true) {
-        return;
-      }
-    }
-
     // if no target resources are found, then mark the source ref as unsatisfied
     if (targetResources.length === 0) {
       createResourceRef(
@@ -280,13 +267,27 @@ function handleRefMappingByKey(
       });
 
       if (!hasSatisfiedRefs) {
-        createResourceRef(
-          sourceResource,
-          ResourceRefType.Unsatisfied,
-          new NodeWrapper(sourceRefNode.scalar, sourceResource.lineCounter),
-          undefined,
-          outgoingRefMapper.target.kind
-        );
+        let shouldCreateUnsatisfiedRef = true;
+        if (outgoingRefMapper.source.hasOptionalSibling) {
+          const optionalSiblingPath = joinPathParts([...outgoingRefMapper.source.pathParts.slice(0, -1), 'optional']);
+          const optionalSiblingRefNode = sourceResource.refNodesByPath
+            ? sourceResource.refNodesByPath[optionalSiblingPath]?.find(refNode =>
+                refNode.parentKeyPath.startsWith(sourceRefNode.parentKeyPath)
+              )
+            : undefined;
+          if (optionalSiblingRefNode && optionalSiblingRefNode.scalar.value === true) {
+            shouldCreateUnsatisfiedRef = false;
+          }
+        }
+        if (shouldCreateUnsatisfiedRef) {
+          createResourceRef(
+            sourceResource,
+            ResourceRefType.Unsatisfied,
+            new NodeWrapper(sourceRefNode.scalar, sourceResource.lineCounter),
+            undefined,
+            outgoingRefMapper.target.kind
+          );
+        }
       }
     }
   });