ui overrides

HubSpot · Oct 25, 2017 · f0955d2 · f0955d2
1 parent 16caab8
commit f0955d2
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/SingularityServiceBase/src/main/java/com/hubspot/singularity/config/UIConfiguration.java b/SingularityServiceBase/src/main/java/com/hubspot/singularity/config/UIConfiguration.java
@@ -97,6 +97,14 @@ public static RootUrlMode parse(String value) {
   @NotNull
   private String authCookieName = "";
 
+  @JsonProperty
+  private Optional<String> apiRootOverride = Optional.absent();
+
+  @JsonProperty
+  private Optional<String> appRootOverride = Optional.absent();
+
+  @JsonProperty
+  private Optional<String> staticRootOverride = Optional.absent();
 
   public boolean isHideNewDeployButton() {
     return hideNewDeployButton;
@@ -238,17 +246,39 @@ public boolean isGenerateAuthHeader() {
     return generateAuthHeader;
   }
 
-  public UIConfiguration setGenerateAuthHeader(boolean generateAuthHeader) {
+  public void setGenerateAuthHeader(boolean generateAuthHeader) {
     this.generateAuthHeader = generateAuthHeader;
-    return this;
   }
 
   public String getAuthCookieName() {
     return authCookieName;
   }
 
-  public UIConfiguration setAuthCookieName(String authCookieName) {
+  public void setAuthCookieName(String authCookieName) {
     this.authCookieName = authCookieName;
-    return this;
+  }
+
+  public Optional<String> getApiRootOverride() {
+    return apiRootOverride;
+  }
+
+  public void setApiRootOverride(Optional<String> apiRootOverride) {
+    this.apiRootOverride = apiRootOverride;
+  }
+
+  public Optional<String> getAppRootOverride() {
+    return appRootOverride;
+  }
+
+  public void setAppRootOverride(Optional<String> appRootOverride) {
+    this.appRootOverride = appRootOverride;
+  }
+
+  public Optional<String> getStaticRootOverride() {
+    return staticRootOverride;
+  }
+
+  public void setStaticRootOverride(Optional<String> staticRootOverride) {
+    this.staticRootOverride = staticRootOverride;
   }
 }
diff --git a/SingularityServiceBase/src/main/java/com/hubspot/singularity/views/IndexView.java b/SingularityServiceBase/src/main/java/com/hubspot/singularity/views/IndexView.java
@@ -73,10 +73,10 @@ public IndexView(String singularityUriBase, String appRoot, IndexViewConfigurati
 
     String rawAppRoot = String.format("%s%s", singularityUriBase, appRoot);
 
-    this.appRoot = (rawAppRoot.endsWith("/")) ? rawAppRoot.substring(0, rawAppRoot.length() - 1) : rawAppRoot;
+    this.appRoot = uiConfiguration.getAppRootOverride().or((rawAppRoot.endsWith("/")) ? rawAppRoot.substring(0, rawAppRoot.length() - 1) : rawAppRoot);
-    this.staticRoot = String.format("%s/static", singularityUriBase);
+    this.staticRoot = uiConfiguration.getStaticRootOverride().or(String.format("%s/static", singularityUriBase));
     this.apiDocs = String.format("%s/api-docs/", singularityUriBase);
-    this.apiRoot = String.format("%s%s", singularityUriBase, ApiPaths.API_BASE_PATH);
+    this.apiRoot = uiConfiguration.getApiRootOverride().or(String.format("%s%s", singularityUriBase, ApiPaths.API_BASE_PATH));
 
     this.title = uiConfiguration.getTitle();