fix(web): Retrieve dependent pipelines correctly

front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/V2PipelineTemplateController.java

@@ -31,7 +31,7 @@
 import com.netflix.spinnaker.front50.model.pipeline.PipelineDAO;
 import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplate;
 import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO;
-import com.netflix.spinnaker.front50.model.pipeline.TemplateConfiguration;
+import com.netflix.spinnaker.front50.model.pipeline.V2TemplateConfiguration;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -186,22 +186,22 @@ List<String> getDependentConfigs(String templateId) {
     List<String> dependentConfigIds = new ArrayList<>();
 
     String prefixedId = SPINNAKER_PREFIX + templateId;
+
     pipelineDAO.all().stream()
         .filter(pipeline -> pipeline.getType() != null && pipeline.getType().equals(TYPE_TEMPLATED))
         .forEach(
             templatedPipeline -> {
               String source;
               try {
-                TemplateConfiguration config =
-                    objectMapper.convertValue(
-                        templatedPipeline.getConfig(), TemplateConfiguration.class);
 
-                source = config.getPipeline().getTemplate().getSource();
+                V2TemplateConfiguration config =
+                    objectMapper.convertValue(templatedPipeline, V2TemplateConfiguration.class);
+                source = config.getTemplate().getReference();
               } catch (Exception e) {
                 return;
               }
 
-              if (source != null && source.equalsIgnoreCase(prefixedId)) {
+              if (source != null && source.startsWith(prefixedId)) {
                 dependentConfigIds.add(templatedPipeline.getId());
               }
             });

front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/V2PipelineTemplateControllerSpec.groovy

@@ -17,11 +17,17 @@
 
 package com.netflix.spinnaker.front50.controllers
 
+import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.front50.exceptions.InvalidEntityException
+import static com.netflix.spinnaker.front50.api.model.pipeline.Pipeline.TYPE_TEMPLATED;
+import static com.netflix.spinnaker.front50.model.pipeline.TemplateConfiguration.TemplateSource.SPINNAKER_PREFIX;
+import com.netflix.spinnaker.front50.api.model.pipeline.Pipeline;
+import com.netflix.spinnaker.front50.model.pipeline.V2TemplateConfiguration;
 import com.netflix.spinnaker.front50.model.pipeline.PipelineDAO
 import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplate
 import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO
+import com.netflix.spinnaker.front50.model.pipeline.TemplateConfiguration
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
@@ -34,7 +40,9 @@ class V2PipelineTemplateControllerSpec extends Specification {
   def controller = new V2PipelineTemplateController(
     pipelineDAO: pipelineDAO,
     pipelineTemplateDAO: pipelineTemplateDAO,
-    objectMapper: new ObjectMapper(),
+    // V2TemplateConfiguration doesn't expect `id` attribute as part of pipeline config.
+    // Hence has to ignore unknown properties when converting the value.
+    objectMapper: new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
   )
 
   def template1 = [
@@ -156,6 +164,102 @@ class V2PipelineTemplateControllerSpec extends Specification {
     hash1 == hash2
   }
 
+  def "verify retrieval of templated pipeline config using v1 approach results in null"() {
+    given:
+
+    def templatedPipeline = new Pipeline(
+      id: "id-of-my-templated-pipeline",
+      name: "name-of-my-templated-pipeline",
+      application: "application",
+      type: TYPE_TEMPLATED,
+      schema: "v2",
+      template: [
+        reference: SPINNAKER_PREFIX + "myPipelineTemplateId"
+      ]
+    )
+    def oneOtherTemplatedPipeline = new Pipeline(
+      id: "id-of-one-other-templated-pipeline",
+      name: "name-of-one-other-templated-pipeline",
+      application: "application",
+      type: TYPE_TEMPLATED,
+      schema: "v2",
+      template: [
+        reference: SPINNAKER_PREFIX + "oneOtherPipelineTemplateId"
+      ]
+    )
+
+    pipelineDAO.all() >> [templatedPipeline, oneOtherTemplatedPipeline]
+
+    when:
+    TemplateConfiguration config = controller.objectMapper.convertValue(
+      templatedPipeline.getConfig(), TemplateConfiguration.class);
+
+    then:
+    config == null
+  }
+
+  def "getDependentConfigs returns empty list when there are no templated pipelines"() {
+    given:
+    pipelineDAO.all() >> []
+
+    when:
+    List<String> dependentConfigIds = controller.getDependentConfigs("myPipelineTemplateId")
+
+    then:
+    dependentConfigIds.isEmpty()
+  }
+
+  def "getDependentConfigs returns empty list when templated pipelines have no dependencies"() {
+    given:
+    Pipeline normalPipeline = new Pipeline()
+    Pipeline templatedPipeline = new Pipeline(id: "id-of-my-templated-pipeline", type: TYPE_TEMPLATED)
+    pipelineDAO.all() >> [normalPipeline, templatedPipeline]
+
+    when:
+    List<String> dependentConfigIds = controller.getDependentConfigs("a-different-pipeline-template-id")
+
+    then:
+    dependentConfigIds.isEmpty()
+  }
+
+  def "getDependentConfigs returns list of dependent pipeline IDs"() {
+    given:
+
+    def normalPipeline = new Pipeline(
+      id: "normalPipeline",
+      name: "normalPipeline",
+      application: "application",
+    )
+    def templatedPipeline = new Pipeline(
+      id: "id-of-my-templated-pipeline",
+      name: "name-of-my-templated-pipeline",
+      application: "application",
+      type: TYPE_TEMPLATED,
+      schema: "v2",
+      template: [
+        reference: SPINNAKER_PREFIX + "myPipelineTemplateId"
+      ]
+    )
+    def oneOtherTemplatedPipeline = new Pipeline(
+      id: "id-of-one-other-templated-pipeline",
+      name: "name-of-one-other-templated-pipeline",
+      application: "application",
+      type: TYPE_TEMPLATED,
+      schema: "v2",
+      template: [
+        reference: SPINNAKER_PREFIX + "oneOtherPipelineTemplateId"
+      ]
+    )
+
+    pipelineDAO.all() >> [normalPipeline, templatedPipeline, oneOtherTemplatedPipeline]
+
+    when:
+    List<String> dependentConfigIds = controller.getDependentConfigs("myPipelineTemplateId")
+
+    then:
+    dependentConfigIds == ["id-of-my-templated-pipeline"]
+  }
+
   @Unroll
   def 'should fail with InvalidEntityException if Id(#id) is not provided or empty'() {
     when:
@@ -168,4 +272,3 @@ class V2PipelineTemplateControllerSpec extends Specification {
     id << [null, "", "    "]
   }
 }
-