Fix stage resolver (spinnaker#3575)

* fix(plugins): Stage resolver requires alias to be passed in if present on the stage context to resolve builders * fix(plugins): Stage resolver requires alias to be passed in if present on the stage context to resolve builders
voiski · Apr 5, 2020 · d517d59 · d517d59
1 parent 26607ff
commit d517d59
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/DefaultStageResolver.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/DefaultStageResolver.java
@@ -73,7 +73,8 @@ public StageDefinitionBuilder getStageDefinitionBuilder(@Nonnull String type, St
             type, stageDefinitionBuilderByAlias.get(typeAlias));
 
     if (stageDefinitionBuilder == null) {
-      throw new NoSuchStageDefinitionBuilderException(type, stageDefinitionBuilderByAlias.keySet());
+      throw new NoSuchStageDefinitionBuilderException(
+          type, typeAlias, stageDefinitionBuilderByAlias.keySet());
     }
 
     return stageDefinitionBuilder;

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/DynamicStageResolver.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/DynamicStageResolver.kt
@@ -80,7 +80,7 @@ class DynamicStageResolver(
     }
 
     if (builder == null) {
-      throw StageResolver.NoSuchStageDefinitionBuilderException(type, stageDefinitionBuildersByAlias.keys)
+      throw StageResolver.NoSuchStageDefinitionBuilderException(type, typeAlias, stageDefinitionBuildersByAlias.keys)
     }
 
     return builder

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/StageResolver.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/StageResolver.java
@@ -59,11 +59,12 @@ class DuplicateStageAliasException extends IllegalStateException {
   }
 
   class NoSuchStageDefinitionBuilderException extends IllegalArgumentException {
-    NoSuchStageDefinitionBuilderException(String type, Collection<String> knownTypes) {
+    NoSuchStageDefinitionBuilderException(
+        String type, String alias, Collection<String> knownTypes) {
       super(
           format(
-              "No StageDefinitionBuilder implementation for %s found (knownTypes: %s)",
-              type, String.join(",", knownTypes)));
+              "No StageDefinitionBuilder implementation for %s(alias: %s) found (knownTypes: %s)",
+              type, alias, String.join(",", knownTypes)));
     }
   }
 }
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/StageNavigator.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/StageNavigator.java
@@ -44,7 +44,12 @@ public StageNavigator(StageResolver stageResolver) {
    */
   public List<Result> ancestors(StageExecution startingStage) {
     return startingStage.ancestors().stream()
-        .map(it -> new Result(it, stageResolver.getStageDefinitionBuilder(it.getType())))
+        .map(
+            it ->
+                new Result(
+                    it,
+                    stageResolver.getStageDefinitionBuilder(
+                        it.getType(), (String) it.getContext().get("alias"))))
         .collect(toList());
   }