fix(triggers): pipeline triggers may not deserialize parent pipeline …

…correctly in some circumstances
spinnaker · Mar 19, 2017 · 711db5c · 711db5c
1 parent 1fbc61e
commit 711db5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/...river/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/DeploymentDetailsAware.groovy b/...river/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/DeploymentDetailsAware.groovy
@@ -18,11 +18,8 @@ package com.netflix.spinnaker.orca.kato.tasks
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
-import com.netflix.spinnaker.orca.pipeline.model.Execution
-import com.netflix.spinnaker.orca.pipeline.model.Orchestration
-import com.netflix.spinnaker.orca.pipeline.model.Pipeline
-import com.netflix.spinnaker.orca.pipeline.model.PipelineStage
-import com.netflix.spinnaker.orca.pipeline.model.Stage
+import com.netflix.spinnaker.orca.jackson.OrcaObjectMapper
+import com.netflix.spinnaker.orca.pipeline.model.*
 
 /**
  * Tasks may implement this trait to get convention-based access to deployment details that should come from in order of preference:
@@ -34,7 +31,7 @@ import com.netflix.spinnaker.orca.pipeline.model.Stage
 trait DeploymentDetailsAware {
 
   private ObjectMapper pipelineObjectMapper =
-    new ObjectMapper().registerModule(new SimpleModule("MyConverterModule").addAbstractTypeMapping(Stage, PipelineStage))
+    new OrcaObjectMapper().registerModule(new SimpleModule("MyConverterModule").addAbstractTypeMapping(Stage, PipelineStage))
 
   void withImageFromPrecedingStage(
     Stage stage,

diff --git a/...com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/CreateServerGroupTaskSpec.groovy b/...com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/CreateServerGroupTaskSpec.groovy
@@ -16,16 +16,13 @@
 
 package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup
 
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.module.SimpleModule
 import com.netflix.spinnaker.orca.clouddriver.KatoService
 import com.netflix.spinnaker.orca.clouddriver.MortService
 import com.netflix.spinnaker.orca.clouddriver.model.TaskId
 import com.netflix.spinnaker.orca.clouddriver.tasks.providers.aws.AmazonServerGroupCreator
 import com.netflix.spinnaker.orca.clouddriver.tasks.providers.gce.GoogleServerGroupCreator
 import com.netflix.spinnaker.orca.pipeline.model.Pipeline
 import com.netflix.spinnaker.orca.pipeline.model.PipelineStage
-import com.netflix.spinnaker.orca.pipeline.model.Stage
 import rx.Observable
 import spock.lang.Shared
 import spock.lang.Specification
@@ -37,19 +34,19 @@ class CreateServerGroupTaskSpec extends Specification {
   ServerGroupCreator aCreator = Stub(ServerGroupCreator) {
     getCloudProvider() >> "aCloud"
     isKatoResultExpected() >> false
-    getOperations(spock.lang.Specification._) >> [["aOp": "foo"]]
+    getOperations(_) >> [["aOp": "foo"]]
   }
   @Shared
   ServerGroupCreator bCreator = Stub(ServerGroupCreator) {
     getCloudProvider() >> "bCloud"
     isKatoResultExpected() >> false
-    getOperations(spock.lang.Specification._) >> [["bOp": "bar"]]
+    getOperations(_) >> [["bOp": "bar"]]
   }
   @Shared
   ServerGroupCreator cCreator = Stub(ServerGroupCreator) {
     getCloudProvider() >> "cCloud"
     isKatoResultExpected() >> true
-    getOperations(spock.lang.Specification._) >> [["cOp": "baz"]]
+    getOperations(_) >> [["cOp": "baz"]]
   }
   @Shared
   TaskId taskId = new TaskId(UUID.randomUUID().toString())
@@ -227,8 +224,6 @@ class CreateServerGroupTaskSpec extends Specification {
     def deployStage = buildStageForPipeline(childPipeline, "createServerGroup", deployConfig)
     makeDependentOn(deployStage, manualJudgmentStage)
 
-    def pipelineObjectMapper =
-      new ObjectMapper().registerModule(new SimpleModule("MyConverterModule").addAbstractTypeMapping(Stage, PipelineStage))
     def deployTask = new CreateServerGroupTask(kato: katoService, serverGroupCreators: buildServerGroupCreators(mortService))
 
     when: