keep params as is until we fix disk and apps too

DataBiosphere · Feb 11, 2025 · 0c82d92 · 0c82d92
1 parent b21ec87
commit 0c82d92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoTestUtils.scala b/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoTestUtils.scala
@@ -404,7 +404,7 @@ trait LeonardoTestUtils
     implicit val patienceConfig: PatienceConfig = clusterPatience
     eventually {
       val allStatus: Set[ClusterStatus] = Leonardo.cluster
-        .listIncludingDeletedRuntime(googleProject)
+        .listRuntime(googleProject)
         .filter(c => c.runtimeName == runtimeName && c.googleProject == googleProject)
         .map(_.status)
         .toSet

diff --git a/.../scala/org/broadinstitute/dsde/workbench/leonardo/http/service/RuntimeServiceInterp.scala b/.../scala/org/broadinstitute/dsde/workbench/leonardo/http/service/RuntimeServiceInterp.scala
@@ -251,7 +251,7 @@ class RuntimeServiceInterp[F[_]: Parallel](
 
       samResources <- samService.listResources(userInfo.accessToken.token, RuntimeSamResource.resourceType)
 
-      (labelMap, _) <- F.fromEither(processListParameters(params))
+      (labelMap, _, _) <- F.fromEither(processListParameters(params))
       excludeStatuses = List(RuntimeStatus.Deleted)
       creatorOnly <- F.fromEither(processCreatorOnlyParameter(userInfo.userEmail, params, ctx.traceId))
 

diff --git a/...cala/org/broadinstitute/dsde/workbench/leonardo/http/service/RuntimeV2ServiceInterp.scala b/...cala/org/broadinstitute/dsde/workbench/leonardo/http/service/RuntimeV2ServiceInterp.scala
@@ -418,7 +418,7 @@ class RuntimeV2ServiceInterp[F[_]: Parallel](
       ctx <- as.ask
 
       // Parameters: parse search filters from request
-      (labelMap, _) <- F.fromEither(processListParameters(params))
+      (labelMap, _, _) <- F.fromEither(processListParameters(params))
       excludeStatuses = List(RuntimeStatus.Deleted)
       creatorEmail <- F.fromEither(processCreatorOnlyParameter(userInfo.userEmail, params, ctx.traceId))
 

diff --git a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/package.scala b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/package.scala
@@ -46,18 +46,26 @@ package object service {
 
   private[service] def processListParameters(
     params: LabelMap
-  ): Either[ParseLabelsException, (LabelMap, List[String])] =
+  ): Either[ParseLabelsException, (LabelMap, Boolean, List[String])] =
     // returns a tuple made of three elements:
     // 1) LabelMap - represents the labels to filter the request by
+    // 2) includeDeleted - Boolean which determines if we include deleted resources in the response
     // 3) includeLabels - List of label keys which represent the labels (key, value pairs) that will be returned in response
     // Note that optional parameter `role` or `creator` (represented by creatorOnlyKey and creatorOnlyValue) is omitted.
     for {
-      labelMap <- processLabelMap(params - includeLabelsKey - creatorOnlyKey - creatorOnlyValue)
+      labelMap <- processLabelMap(params - includeDeletedKey - includeLabelsKey - creatorOnlyKey - creatorOnlyValue)
+      includeDeleted = params.get(includeDeletedKey) match {
+        case Some(includeDeletedValue) =>
+          if (includeDeletedValue.toLowerCase == "true")
+            true
+          else false
+        case None => false
+      }
       includeLabels <- params.get(includeLabelsKey) match {
         case Some(includeLabelsValue) => processLabelsToReturn(includeLabelsValue)
         case None                     => Either.right(List.empty[String])
       }
-    } yield (labelMap, includeLabels)
+    } yield (labelMap, includeDeleted, includeLabels)
 
   /**
    * Top-level query string parameter for apps and disks: GET /api/apps?includeLabels=foo,bar