From 213667491677ef2f3691869de9624620e5258035 Mon Sep 17 00:00:00 2001
From: Mark Rampton <mark.rampton@armory.io>
Date: Tue, 29 Oct 2019 10:21:59 -0700
Subject: [PATCH] feat(bakeManifest/kustomize): add kustomizeFilePath to
 support git/repo artifact type (#3260)

---
 .../api/manifests/kustomize/KustomizeBakeManifestRequest.java | 4 ++++
 .../orca/bakery/tasks/manifests/BakeManifestContext.java      | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/api/manifests/kustomize/KustomizeBakeManifestRequest.java b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/api/manifests/kustomize/KustomizeBakeManifestRequest.java
index fdf38a25e1..5d64136c87 100644
--- a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/api/manifests/kustomize/KustomizeBakeManifestRequest.java
+++ b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/api/manifests/kustomize/KustomizeBakeManifestRequest.java
@@ -29,6 +29,9 @@ public class KustomizeBakeManifestRequest extends BakeManifestRequest {
   @JsonProperty("inputArtifact")
   private Artifact inputArtifact;
 
+  @JsonProperty("kustomizeFilePath")
+  private String kustomizeFilePath;
+
   public KustomizeBakeManifestRequest(
       BakeManifestContext bakeManifestContext, Artifact inputArtifact, String outputArtifactName) {
     super(
@@ -36,5 +39,6 @@ public KustomizeBakeManifestRequest(
         outputArtifactName,
         bakeManifestContext.getOutputName());
     this.inputArtifact = inputArtifact;
+    this.kustomizeFilePath = bakeManifestContext.getKustomizeFilePath();
   }
 }
diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java
index 55896d74b7..cee5cec544 100644
--- a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java
+++ b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java
@@ -35,6 +35,7 @@ public class BakeManifestContext {
   private final String outputName;
   private final String namespace;
   private final Boolean rawOverrides;
+  @Nullable private final String kustomizeFilePath;
   // There does not seem to be a way to auto-generate a constructor using our current version of
   // Lombok (1.16.20) that
   // Jackson can use to deserialize.
@@ -48,6 +49,7 @@ public BakeManifestContext(
       @JsonProperty("outputName") String outputName,
       @JsonProperty("namespace") String namespace,
       @Nullable @JsonProperty("inputArtifact") CreateBakeManifestTask.InputArtifact inputArtifact,
+      @Nullable @JsonProperty("kustomizeFilePath") String kustomizeFilePath,
       @JsonProperty("rawOverrides") Boolean rawOverrides) {
     this.inputArtifacts = Optional.of(inputArtifacts).orElse(new ArrayList<>());
     // Kustomize stage configs provide a single input artifact
@@ -60,6 +62,7 @@ public BakeManifestContext(
     this.templateRenderer = templateRenderer;
     this.outputName = outputName;
     this.namespace = namespace;
+    this.kustomizeFilePath = kustomizeFilePath;
     this.rawOverrides = rawOverrides;
   }
 }