Fix poll logic

broadinstitute · Mar 22, 2020 · c59bf28 · c59bf28
1 parent 647024f
commit c59bf28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeInterpreter.scala b/...2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeInterpreter.scala
@@ -277,10 +277,11 @@ private[google2] class GoogleComputeInterpreter[F[_]: Async: StructuredLogger: T
 
   override def pollOperation(project: GoogleProject, operation: Operation, delay: FiniteDuration, maxAttempts: Int)(
     implicit ev: ApplicativeAsk[F, TraceId]
-  ): Stream[F, Operation] =
+  ): Stream[F, PollOperation] =
     (Stream.eval(getOperation(project, operation)) ++ Stream.sleep_(delay))
       .repeatN(maxAttempts)
-      .takeThrough(_.getStatus == "DONE")
+      .map(op => PollOperation(op, op.getStatus == "DONE"))
+      .takeThrough(!_.isDone)
 
   private def buildMachineTypeUri(zone: ZoneName, machineTypeName: MachineTypeName): String =
     s"zones/${zone.value}/machineTypes/${machineTypeName.value}"

diff --git a/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeService.scala b/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeService.scala
@@ -95,7 +95,7 @@ trait GoogleComputeService[F[_]] {
 
   def pollOperation(project: GoogleProject, operation: Operation, delay: FiniteDuration, maxAttempts: Int)(
     implicit ev: ApplicativeAsk[F, TraceId]
-  ): Stream[F, Operation]
+  ): Stream[F, PollOperation]
 }
 
 object GoogleComputeService {
@@ -195,3 +195,4 @@ final case class MachineTypeName(value: String) extends AnyVal
 final case class RegionName(value: String) extends AnyVal
 final case class NetworkName(value: String) extends AnyVal
 final case class SubnetworkName(value: String) extends AnyVal
+final case class PollOperation(op: Operation, isDone: Boolean)