Skip to content

Commit 9a99f9d

Browse files
author
Ender Tunc
committed
address pull request feedback
1 parent 8c14342 commit 9a99f9d

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

modules/core/src/main/scala/org/scalasteward/core/forge/ForgeSelection.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object ForgeSelection {
4343
)(implicit
4444
httpJsonClient: HttpJsonClient[F],
4545
logger: Logger[F],
46-
temporal: Temporal[F]
46+
F: Temporal[F]
4747
): ForgeApiAlg[F] = {
4848
val auth = (_: Any) => authenticate(forgeCfg.tpe, user)
4949
forgeSpecificCfg match {

modules/core/src/main/scala/org/scalasteward/core/forge/gitlab/GitLabApiAlg.scala

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.scalasteward.core.forge.gitlab
1818

1919
import cats.effect.Temporal
20-
import cats.{MonadThrow, Parallel}
20+
import cats.Parallel
2121
import cats.syntax.all._
2222
import io.circe._
2323
import io.circe.generic.semiauto._
@@ -165,8 +165,7 @@ final class GitLabApiAlg[F[_]: Parallel](
165165
)(implicit
166166
client: HttpJsonClient[F],
167167
logger: Logger[F],
168-
F: MonadThrow[F],
169-
temporal: Temporal[F]
168+
F: Temporal[F]
170169
) extends ForgeApiAlg[F] {
171170
import GitLabJsonCodec._
172171

@@ -217,21 +216,21 @@ final class GitLabApiAlg[F[_]: Parallel](
217216
.get[MergeRequestOut](url.existingMergeRequest(repo, number), modify(repo))
218217
.flatMap {
219218
case mr if mr.mergeStatus =!= GitLabMergeStatus.Checking => F.pure(mr)
220-
case _ if retries > 0 =>
219+
case mr if retries > 0 =>
221220
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. " +
223222
s"Remaining retries count is $retries"
224-
) >> temporal.sleep(initialDelay) >> waitForMergeRequestStatus(
223+
) >> F.sleep(initialDelay) >> waitForMergeRequestStatus(
225224
number,
226225
retries - 1,
227226
initialDelay * backoffMultiplier
228227
)
229-
case other =>
228+
case mr =>
230229
logger
231230
.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}'"
233232
)
234-
.as(other)
233+
.as(mr)
235234
}
236235

237236
val updatedMergeRequest =

0 commit comments

Comments
 (0)