Merge pull request #2173 from HubSpot/disabled_actions_fix

Remap names in disabled actions list
HubSpot · Jan 29, 2021 · b8b9327 · b8b9327
2 parents 3272bd9 + 630a795
commit b8b9327
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/SingularityBase/src/main/java/com/hubspot/singularity/SingularityAction.java b/SingularityBase/src/main/java/com/hubspot/singularity/SingularityAction.java
@@ -25,10 +25,18 @@ public enum SingularityAction {
   DISABLE_ACTION(false),
   ENABLE_ACTION(false),
   VIEW_DISASTERS(false),
+  @Deprecated
   FREEZE_SLAVE(true),
+  FREEZE_AGENT(true),
+  @Deprecated
   ACTIVATE_SLAVE(true),
+  ACTIVATE_AGENT(true),
+  @Deprecated
   DECOMMISSION_SLAVE(true),
+  DECOMMISSION_AGENT(true),
+  @Deprecated
   VIEW_SLAVES(false),
+  VIEW_AGENTS(false),
   FREEZE_RACK(true),
   ACTIVATE_RACK(true),
   DECOMMISSION_RACK(true),

diff --git a/SingularityService/src/main/java/com/hubspot/singularity/data/DisasterManager.java b/SingularityService/src/main/java/com/hubspot/singularity/data/DisasterManager.java
@@ -68,20 +68,21 @@ public SingularityDisabledAction getDisabledAction(SingularityAction action) {
       new SingularityDisabledAction(
         action,
         String.format(MESSAGE_FORMAT, action, DEFAULT_MESSAGE),
-        Optional.<String>empty(),
+        Optional.empty(),
         false,
-        Optional.<Long>empty()
+        Optional.empty()
       )
     );
   }
 
   public SingularityCreateResult disable(
-    SingularityAction action,
+    SingularityAction input,
     Optional<String> maybeMessage,
     Optional<SingularityUser> user,
     boolean systemGenerated,
     Optional<Long> expiresAt
   ) {
+    SingularityAction action = mapAction(input);
     if (!action.isCanDisable()) {
       throw new IllegalArgumentException(
         String.format("Action %s cannot be disabled", action)
@@ -90,7 +91,7 @@ public SingularityCreateResult disable(
     SingularityDisabledAction disabledAction = new SingularityDisabledAction(
       action,
       String.format(MESSAGE_FORMAT, action, maybeMessage.orElse(DEFAULT_MESSAGE)),
-      user.isPresent() ? Optional.of(user.get().getId()) : Optional.<String>empty(),
+      user.map(SingularityUser::getId),
       systemGenerated,
       expiresAt
     );
@@ -99,7 +100,22 @@ public SingularityCreateResult disable(
   }
 
   public SingularityDeleteResult enable(SingularityAction action) {
-    return delete(getActionPath(action));
+    return delete(getActionPath(mapAction(action)));
+  }
+
+  private SingularityAction mapAction(SingularityAction action) {
+    switch (action) {
+      case FREEZE_SLAVE:
+        return SingularityAction.FREEZE_AGENT;
+      case ACTIVATE_SLAVE:
+        return SingularityAction.ACTIVATE_AGENT;
+      case DECOMMISSION_SLAVE:
+        return SingularityAction.DECOMMISSION_AGENT;
+      case VIEW_SLAVES:
+        return SingularityAction.VIEW_AGENTS;
+      default:
+        return action;
+    }
   }
 
   public List<SingularityDisabledAction> getDisabledActions() {

diff --git a/SingularityService/src/main/java/com/hubspot/singularity/resources/AgentResource.java b/SingularityService/src/main/java/com/hubspot/singularity/resources/AgentResource.java
@@ -169,7 +169,7 @@ public void decommissionAgent(
       agentId,
       maybeChangeRequest,
       user,
-      SingularityAction.DECOMMISSION_SLAVE
+      SingularityAction.DECOMMISSION_AGENT
     );
   }
 
@@ -206,7 +206,7 @@ public void freezeAgent(
     final Optional<SingularityMachineChangeRequest> maybeChangeRequest = Optional.ofNullable(
       changeRequest
     );
-    super.freeze(agentId, maybeChangeRequest, user, SingularityAction.FREEZE_SLAVE);
+    super.freeze(agentId, maybeChangeRequest, user, SingularityAction.FREEZE_AGENT);
   }
 
   @POST
@@ -244,7 +244,7 @@ public void activateAgent(
     final Optional<SingularityMachineChangeRequest> maybeChangeRequest = Optional.ofNullable(
       changeRequest
     );
-    super.activate(agentId, maybeChangeRequest, user, SingularityAction.ACTIVATE_SLAVE);
+    super.activate(agentId, maybeChangeRequest, user, SingularityAction.ACTIVATE_AGENT);
   }
 
   @DELETE

diff --git a/...arityService/src/main/java/com/hubspot/singularity/resources/AgentResourceDeprecated.java b/...arityService/src/main/java/com/hubspot/singularity/resources/AgentResourceDeprecated.java
@@ -173,7 +173,7 @@ public void decommissionSlave(
       slaveId,
       maybeChangeRequest,
       user,
-      SingularityAction.DECOMMISSION_SLAVE
+      SingularityAction.DECOMMISSION_AGENT
     );
   }
 
@@ -210,7 +210,7 @@ public void freezeSlave(
     final Optional<SingularityMachineChangeRequest> maybeChangeRequest = Optional.ofNullable(
       changeRequest
     );
-    super.freeze(slaveId, maybeChangeRequest, user, SingularityAction.FREEZE_SLAVE);
+    super.freeze(slaveId, maybeChangeRequest, user, SingularityAction.FREEZE_AGENT);
   }
 
   @POST
@@ -248,7 +248,7 @@ public void activateSlave(
     final Optional<SingularityMachineChangeRequest> maybeChangeRequest = Optional.ofNullable(
       changeRequest
     );
-    super.activate(slaveId, maybeChangeRequest, user, SingularityAction.ACTIVATE_SLAVE);
+    super.activate(slaveId, maybeChangeRequest, user, SingularityAction.ACTIVATE_AGENT);
   }
 
   @DELETE