Let text searches access the vidarr id

oicr-gsi · Jun 18, 2024 · cab52cb · cab52cb
1 parent 2bfe974
commit cab52cb
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 1 deletion.
diff --git a/changes/fix_vidarr-search.md b/changes/fix_vidarr-search.md
@@ -0,0 +1,2 @@
+Text search includes vidarr id
+
diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunState.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunState.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 /**
@@ -20,6 +21,8 @@
  */
 abstract class RunState {
 
+  public abstract boolean search(Pattern query);
+
   public static final class PerformResult {
     private final ActionState actionState;
     private final List<String> errors;

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateAttemptSubmit.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateAttemptSubmit.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 /** State when we have no knowledge of what's going on in Vidarr */
@@ -36,6 +37,11 @@ public RunStateAttemptSubmit(int attempt) {
     this.attempt = attempt;
   }
 
+  @Override
+  public boolean search(Pattern query) {
+    return false;
+  }
+
   @Override
   public AvailableCommands commands() {
     return AvailableCommands.RESET_ONLY;

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateConflicted.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateConflicted.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 final class RunStateConflicted extends RunState {
@@ -26,6 +27,11 @@ public RunStateConflicted(List<String> ids) {
                 + String.join(", ", ids));
   }
 
+  @Override
+  public boolean search(Pattern query) {
+    return ids.stream().anyMatch(id -> query.matcher(id).matches());
+  }
+
   @Override
   public AvailableCommands commands() {
     return AvailableCommands.RESET_ONLY;

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateDead.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateDead.java
@@ -10,10 +10,16 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 final class RunStateDead extends RunState {
 
+  @Override
+  public boolean search(Pattern query) {
+    return false;
+  }
+
   @Override
   public AvailableCommands commands() {
     return AvailableCommands.RESET_ONLY;

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateMissing.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateMissing.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -34,6 +35,11 @@ public RunStateMissing(String id, List<ExternalKey> keys) {
             .collect(Collectors.toList());
   }
 
+  @Override
+  public boolean search(Pattern query) {
+    return query.matcher(id).matches();
+  }
+
   @Override
   public AvailableCommands commands() {
     return AvailableCommands.RESET_ONLY;

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateMonitor.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/RunStateMonitor.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 final class RunStateMonitor extends RunState {
@@ -93,6 +94,11 @@ public RunStateMonitor(String workflowRunUrl, WorkflowRunStatusResponse status)
     this.status = status;
   }
 
+  @Override
+  public boolean search(Pattern query) {
+    return query.matcher(status.getId()).matches();
+  }
+
   @Override
   public AvailableCommands commands() {
     // Failed during provision out may be retried

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/SubmitAction.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/SubmitAction.java
@@ -226,7 +226,8 @@ public boolean search(Pattern query) {
                                         || query.matcher(v.getValue()).matches()))
         || checkJson(request.getArguments(), query)
         || checkJson(request.getMetadata(), query)
-        || checkJson(request.getEngineParameters(), query);
+        || checkJson(request.getEngineParameters(), query)
+        || state.search(query);
   }
 
   @ActionParameter(required = false)