|
17 | 17 | package org.scalasteward.core.forge.gitlab
|
18 | 18 |
|
19 | 19 | import cats.effect.Temporal
|
20 |
| -import cats.{MonadThrow, Parallel} |
| 20 | +import cats.Parallel |
21 | 21 | import cats.syntax.all._
|
22 | 22 | import io.circe._
|
23 | 23 | import io.circe.generic.semiauto._
|
@@ -165,8 +165,7 @@ final class GitLabApiAlg[F[_]: Parallel](
|
165 | 165 | )(implicit
|
166 | 166 | client: HttpJsonClient[F],
|
167 | 167 | logger: Logger[F],
|
168 |
| - F: MonadThrow[F], |
169 |
| - temporal: Temporal[F] |
| 168 | + F: Temporal[F] |
170 | 169 | ) extends ForgeApiAlg[F] {
|
171 | 170 | import GitLabJsonCodec._
|
172 | 171 |
|
@@ -217,21 +216,21 @@ final class GitLabApiAlg[F[_]: Parallel](
|
217 | 216 | .get[MergeRequestOut](url.existingMergeRequest(repo, number), modify(repo))
|
218 | 217 | .flatMap {
|
219 | 218 | case mr if mr.mergeStatus =!= GitLabMergeStatus.Checking => F.pure(mr)
|
220 |
| - case _ if retries > 0 => |
| 219 | + case mr if retries > 0 => |
221 | 220 | logger.info(
|
222 |
| - s"Merge request is still in '${GitLabMergeStatus.Checking}' state. We will check merge request status in $initialDelay again. " + |
| 221 | + s"Merge request is still in '${mr.mergeStatus}' state. We will check merge request status in $initialDelay again. " + |
223 | 222 | s"Remaining retries count is $retries"
|
224 |
| - ) >> temporal.sleep(initialDelay) >> waitForMergeRequestStatus( |
| 223 | + ) >> F.sleep(initialDelay) >> waitForMergeRequestStatus( |
225 | 224 | number,
|
226 | 225 | retries - 1,
|
227 | 226 | initialDelay * backoffMultiplier
|
228 | 227 | )
|
229 |
| - case other => |
| 228 | + case mr => |
230 | 229 | logger
|
231 | 230 | .warn(
|
232 |
| - s"Exhausted all retires while waiting for merge request status. Last known status is '${other.mergeStatus}'" |
| 231 | + s"Exhausted all retries while waiting for merge request status. Last known status is '${mr.mergeStatus}'" |
233 | 232 | )
|
234 |
| - .as(other) |
| 233 | + .as(mr) |
235 | 234 | }
|
236 | 235 |
|
237 | 236 | val updatedMergeRequest =
|
|
0 commit comments