fix(titus): Serde fix for SagaContext (#4081)

spinnaker · Oct 8, 2019 · 6bf4d91 · 6bf4d91
1 parent 2e383b6
commit 6bf4d91
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/deploy/description/TitusDeployDescription.java b/...vy/com/netflix/spinnaker/clouddriver/titus/deploy/description/TitusDeployDescription.java
@@ -1,5 +1,6 @@
 package com.netflix.spinnaker.clouddriver.titus.deploy.description;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.netflix.spinnaker.clouddriver.deploy.DeployDescription;
 import com.netflix.spinnaker.clouddriver.orchestration.SagaContextAware;
 import com.netflix.spinnaker.clouddriver.orchestration.events.OperationEvent;
@@ -17,6 +18,7 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -81,11 +83,18 @@ public Collection<String> getApplications() {
     return Arrays.asList(application);
   }
 
+  @JsonIgnore
   @Override
   public void setSagaContext(SagaContext sagaContext) {
     this.sagaContext = sagaContext;
   }
 
+  @JsonIgnore
+  @Nullable
+  public SagaContext getSagaContext() {
+    return sagaContext;
+  }
+
   /** For Jackson deserialization. */
   public void setApplications(List<String> applications) {
     if (!applications.isEmpty()) {

diff --git a/...iptions/TitusDeployDescriptionSpec.groovy → ...ription/TitusDeployDescriptionSpec.groovy b/...iptions/TitusDeployDescriptionSpec.groovy → ...ription/TitusDeployDescriptionSpec.groovy
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.spinnaker.clouddriver.titus.deploy.descriptions
+package com.netflix.spinnaker.clouddriver.titus.deploy.description
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.netflix.spinnaker.clouddriver.orchestration.SagaContextAware
 import com.netflix.spinnaker.clouddriver.titus.client.model.MigrationPolicy
 import com.netflix.spinnaker.clouddriver.titus.credentials.NetflixTitusCredentials
-import com.netflix.spinnaker.clouddriver.titus.deploy.description.TitusDeployDescription
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -59,7 +59,12 @@ class TitusDeployDescriptionSpec extends Specification {
         networkMbps: 128
       ),
       securityGroups: [],
-      softConstraints: []
+      softConstraints: [],
+      sagaContext: new SagaContextAware.SagaContext(
+        "titus",
+        "createServerGroup",
+        [:]
+      )
     )
 
     when: