fix(deployment): fixed missing namespace while fetching manifest deta…

…ils from clouddriver (#4453) (#4456) (cherry picked from commit 435a5c3) Co-authored-by: Krzysztof Kotula <[email protected]>
spinnaker · May 18, 2023 · 6ca6d71 · 6ca6d71
1 parent ccdbea7
commit 6ca6d71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...in/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java b/...in/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java
@@ -157,7 +157,7 @@ private void deleteOrDisableOldManifest(
           (name, manifest) -> {
             var oldManifestIsUnstable =
                 this.manifestOperationsHelper.previousDeploymentNeitherStableNorFailed(
-                    manifest.getAccount(), name);
+                    manifest.getAccount(), manifest.getNamespace(), name);
             var nextStageType =
                 oldManifestIsUnstable
                     ? DeleteManifestStage.PIPELINE_CONFIG_TYPE
@@ -253,8 +253,8 @@ ImmutableList<String> getOldManifestNames(DeployedManifest dm) {
      * @param name of the manifest
      * @return true, if manifest was not deployed correctly and waits to get stable, false otherwise
      */
-    boolean previousDeploymentNeitherStableNorFailed(String account, String name) {
-      var oldManifest = this.oortService.getManifest(account, name, false);
+    boolean previousDeploymentNeitherStableNorFailed(String account, String location, String name) {
+      var oldManifest = this.oortService.getManifest(account, location, name, false);
 
       var status = oldManifest.getStatus();
       var notStable = !status.getStable().isState();

diff --git a/...ava/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java b/...ava/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java
@@ -321,6 +321,7 @@ private void givenManifestIsNotStable() {
   }
 
   private void givenManifestIs(Manifest manifest) {
-    when(oortService.getManifest(anyString(), anyString(), anyBoolean())).thenReturn(manifest);
+    when(oortService.getManifest(anyString(), anyString(), anyString(), anyBoolean()))
+        .thenReturn(manifest);
   }
 }