From 39c4dbef9ac84e391efabec9bf7e600baeb12f84 Mon Sep 17 00:00:00 2001
From: Michael Tweten <Michael.Tweten@cerner.com>
Date: Thu, 20 Jun 2019 14:02:38 -0500
Subject: [PATCH] =?UTF-8?q?feat(kubernetes):=20Skip=20loading=20events=20f?=
 =?UTF-8?q?or=20manifest=20retrieval=20in=20WaitF=E2=80=A6=20(#2997)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(kubernetes): Skip loading events for manifest retrieval in WaitForManifestStableTask

* Account for changes from https://github.com/spinnaker/clouddriver/pull/3796
---
 .../orca/clouddriver/DelegatingOortService.java        | 10 +++++-----
 .../spinnaker/orca/clouddriver/OortService.groovy      |  6 ++++--
 .../tasks/artifacts/FindArtifactsFromResourceTask.java |  3 ++-
 .../tasks/manifest/WaitForManifestStableTask.java      |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java
index 051cf47091..12a32c6347 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java
@@ -37,15 +37,15 @@ public Response getCluster(String app, String account, String cluster, String cl
   }
 
   @Override
-  public Manifest getManifest(String account, String name) {
-    return getService().getManifest(account, name);
+  public Manifest getManifest(String account, String name, boolean includeEvents) {
+    return getService().getManifest(account, name, includeEvents);
   }
 
   @Override
-  public Manifest getManifest(String account, String location, String name) {
+  public Manifest getManifest(String account, String location, String name, boolean includeEvents) {
     return StringUtils.isEmpty(location)
-        ? getService().getManifest(account, name)
-        : getService().getManifest(account, location, name);
+        ? getService().getManifest(account, name, includeEvents)
+        : getService().getManifest(account, location, name, includeEvents);
   }
 
   @Override
diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/OortService.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/OortService.groovy
index 5d495e8861..d9e86d6ad5 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/OortService.groovy
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/OortService.groovy
@@ -47,12 +47,14 @@ interface OortService {
 
   @GET("/manifests/{account}/_/{manifest}")
   Manifest getManifest(@Path("account") String account,
-                       @Path("manifest") String manifest)
+                       @Path("manifest") String manifest,
+                       @Query("includeEvents") boolean includeEvents)
 
   @GET("/manifests/{account}/{location}/{manifest}")
   Manifest getManifest(@Path("account") String account,
                        @Path("location") String location,
-                       @Path("manifest") String manifest)
+                       @Path("manifest") String manifest,
+                       @Query("includeEvents") boolean includeEvents)
 
   @GET("/manifests/{account}/{location}/{kind}/cluster/{app}/{clusterName}/dynamic/{criteria}")
   Manifest getDynamicManifest(@Path("account") String account,
diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/artifacts/FindArtifactsFromResourceTask.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/artifacts/FindArtifactsFromResourceTask.java
index 7c445441ea..26b6e342cd 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/artifacts/FindArtifactsFromResourceTask.java
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/artifacts/FindArtifactsFromResourceTask.java
@@ -49,7 +49,8 @@ public TaskResult execute(@Nonnull Stage stage) {
 
     Manifest manifest =
         retrySupport.retry(
-            () -> oortService.getManifest(account, stageData.location, stageData.manifestName),
+            () ->
+                oortService.getManifest(account, stageData.location, stageData.manifestName, false),
             5,
             1000,
             true);
diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTask.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTask.java
index 7b7766cef9..eab198c365 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTask.java
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTask.java
@@ -78,7 +78,7 @@ public TaskResult execute(@Nonnull Stage stage) {
         String identifier = readableIdentifier(account, location, name);
         Manifest manifest;
         try {
-          manifest = oortService.getManifest(account, location, name);
+          manifest = oortService.getManifest(account, location, name, false);
         } catch (RetrofitError e) {
           log.warn("Unable to read manifest {}", identifier, e);
           return TaskResult.builder(ExecutionStatus.RUNNING)