fix(titus): Loading front50 app should be optional (#3955)

spinnaker · Aug 16, 2019 · 8e37e6a · 8e37e6a
1 parent 8cf11dd
commit 8e37e6a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/...rc/main/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/LoadFront50App.java b/...rc/main/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/LoadFront50App.java
@@ -118,6 +118,10 @@ public Result apply(@NotNull LoadFront50AppCommand command, @NotNull Saga saga)
       }
     } catch (Exception e) {
       log.error("Failed to load front50 application attributes for {}", command.getAppName(), e);
+      if (command.isAllowMissing()) {
+        // It's ok to not load the front50 application
+        return new Result();
+      }
       throw new SystemException(
           format("Failed to load front50 application: %s", command.getAppName()), e);
     }
@@ -128,25 +132,24 @@ public Result apply(@NotNull LoadFront50AppCommand command, @NotNull Saga saga)
   public static class LoadFront50AppCommand extends SagaCommand {
     @Nonnull private final String appName;
     @Nonnull private final SagaCommand nextCommand;
+    @Nonnull private final boolean allowMissing;
 
     public LoadFront50AppCommand(
         @NotNull String sagaName,
         @NotNull String sagaId,
         @Nonnull String appName,
-        @Nonnull SagaCommand nextCommand) {
+        @Nonnull SagaCommand nextCommand,
+        boolean allowMissing) {
       super(sagaName, sagaId);
       this.appName = appName;
       this.nextCommand = nextCommand;
+      this.allowMissing = allowMissing;
     }
   }
 
-  /**
-   * Marks a SagaCommand as being aware of the result of the LoadFront50App SagaAction.
-   *
-   * <p>TODO(rz): Refactor SagaCommand (and by proxy, SpinnakerEvent) to be an interface
-   */
+  /** Marks a SagaCommand as being aware of the result of the LoadFront50App SagaAction. */
   interface Front50AppAware {
-    void setFront50App(@Nonnull Front50App app);
+    void setFront50App(Front50App app);
   }
 
   @Value

diff --git a/...ain/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/PrepareTitusDeploy.java b/...ain/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/PrepareTitusDeploy.java
@@ -460,7 +460,7 @@ public PrepareTitusDeployCommand(
     }
 
     @Override
-    public void setFront50App(@Nonnull LoadFront50App.Front50App app) {
+    public void setFront50App(LoadFront50App.Front50App app) {
       this.front50App = app;
     }
   }

diff --git a/...rc/main/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/SubmitTitusJob.java b/...rc/main/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/SubmitTitusJob.java
@@ -167,7 +167,7 @@ public static class SubmitTitusJobCommand extends SagaCommand implements Front50
     @Nonnull private final SubmitJobRequest submitJobRequest;
     @Nonnull private final String nextServerGroupName;
     @Nullable private final TargetGroupLookupHelper.TargetGroupLookupResult targetGroupLookupResult;
-    @NonFinal private LoadFront50App.Front50App front50App;
+    @Nullable @NonFinal private LoadFront50App.Front50App front50App;
 
     public SubmitTitusJobCommand(
         @NotNull String sagaName,
@@ -184,7 +184,7 @@ public SubmitTitusJobCommand(
     }
 
     @Override
-    public void setFront50App(@Nonnull LoadFront50App.Front50App app) {
+    public void setFront50App(LoadFront50App.Front50App app) {
       this.front50App = app;
     }
   }

diff --git a/...in/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/handlers/TitusDeployHandler.java b/...in/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/handlers/TitusDeployHandler.java
@@ -67,7 +67,8 @@ public TitusDeploymentResult handle(
                 sagaName,
                 sagaId,
                 inputDescription.getApplication(),
-                new PrepareTitusDeployCommand(sagaName, sagaId, inputDescription)));
+                new PrepareTitusDeployCommand(sagaName, sagaId, inputDescription),
+                true));
 
     if (result == null) {
       // "This should never happen"