[Code review] Refactoring - add config to vcsExtraAlg

Author: eugeniyk

modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala

@@ -163,7 +163,7 @@ final class NurtureAlg[F[_]](implicit
         existingArtifactUrlsMap
           .get(data.update.mainArtifactId)
           .traverse(
-            vcsExtraAlg.getReleaseRelatedUrls(config.vcsType, config.vcsApiHost, _, data.update)
+            vcsExtraAlg.getReleaseRelatedUrls(_, data.update)
           )
       branchName = vcs.createBranch(config.vcsType, data.fork, data.update)
       migrations = migrationAlg.findMigrations(data.update)

modules/core/src/main/scala/org/scalasteward/core/vcs/VCSExtraAlg.scala

@@ -19,15 +19,13 @@ package org.scalasteward.core.vcs
 import cats.Monad
 import cats.syntax.all._
 import org.http4s.Uri
-import org.scalasteward.core.application.SupportedVCS
+import org.scalasteward.core.application.Config
 import org.scalasteward.core.data.{ReleaseRelatedUrl, Update}
 import org.scalasteward.core.util.HttpExistenceClient
 import org.scalasteward.core.vcs
 
 trait VCSExtraAlg[F[_]] {
   def getReleaseRelatedUrls(
-      vcsType: SupportedVCS,
-      vcsUri: Uri,
       repoUrl: Uri,
       update: Update
   ): F[List[ReleaseRelatedUrl]]
@@ -36,17 +34,16 @@ trait VCSExtraAlg[F[_]] {
 object VCSExtraAlg {
   def create[F[_]](implicit
       existenceClient: HttpExistenceClient[F],
+      config: Config,
       F: Monad[F]
   ): VCSExtraAlg[F] =
     new VCSExtraAlg[F] {
       override def getReleaseRelatedUrls(
-          vcsType: SupportedVCS,
-          vcsUri: Uri,
           repoUrl: Uri,
           update: Update
       ): F[List[ReleaseRelatedUrl]] =
         vcs
-          .possibleReleaseRelatedUrls(vcsType, vcsUri, repoUrl, update)
+          .possibleReleaseRelatedUrls(config.vcsType, config.vcsApiHost, repoUrl, update)
           .filterA(releaseRelatedUrl => existenceClient.exists(releaseRelatedUrl.url))
     }
 }

modules/core/src/main/scala/org/scalasteward/core/vcs/package.scala

@@ -126,11 +126,10 @@ package object vcs {
     val repoVCSType = extractRepoVCSType(vcsType, vcsUri, repoUrl)
 
     val github = repoVCSType
-      .collect {
-        case GitHub =>
-          possibleTags(update.nextVersion).map(tag =>
-            ReleaseRelatedUrl.GitHubReleaseNotes(repoUrl / "releases" / "tag" / tag)
-          )
+      .collect { case GitHub =>
+        possibleTags(update.nextVersion).map(tag =>
+          ReleaseRelatedUrl.GitHubReleaseNotes(repoUrl / "releases" / "tag" / tag)
+        )
       }
       .getOrElse(List.empty)
 

modules/core/src/test/scala/org/scalasteward/core/vcs/VCSExtraAlgTest.scala

@@ -7,9 +7,9 @@ import org.http4s.dsl.io._
 import org.http4s.implicits._
 import org.scalasteward.core.TestInstances.ioLogger
 import org.scalasteward.core.TestSyntax._
-import org.scalasteward.core.application.SupportedVCS
+import org.scalasteward.core.application.{Config, SupportedVCS}
 import org.scalasteward.core.data.{ReleaseRelatedUrl, Update}
-import org.scalasteward.core.mock.MockContext.config
+import org.scalasteward.core.mock.MockContext
 import org.scalasteward.core.util.{HttpExistenceClient, Nel}
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
@@ -22,29 +22,27 @@ class VCSExtraAlgTest extends AnyFunSuite with Matchers {
       case _                                                            => NotFound()
     }
 
+  implicit val cfg = MockContext.config
   implicit val client = Client.fromHttpApp[IO](routes.orNotFound)
   implicit val httpExistenceClient =
     HttpExistenceClient.create[IO].allocated.map(_._1).unsafeRunSync()
 
-  val vcsExtraAlg = VCSExtraAlg.create[IO]
   val updateFoo = Update.Single("com.example" % "foo" % "0.1.0", Nel.of("0.2.0"))
   val updateBar = Update.Single("com.example" % "bar" % "0.1.0", Nel.of("0.2.0"))
   val updateBuz = Update.Single("com.example" % "buz" % "0.1.0", Nel.of("0.2.0"))
 
-  test("getBranchCompareUrl") {
+  test("getBranchCompareUrl: std vsc") {
+    val vcsExtraAlg = VCSExtraAlg.create[IO]
+
     vcsExtraAlg
       .getReleaseRelatedUrls(
-        SupportedVCS.Gitlab,
-        uri"https://gitlab.com/",
         uri"https://github.com/foo/foo",
         updateFoo
       )
       .unsafeRunSync() shouldBe List.empty
 
     vcsExtraAlg
       .getReleaseRelatedUrls(
-        SupportedVCS.Gitlab,
-        uri"https://gitlab.com/",
         uri"https://github.com/foo/bar",
         updateBar
       )
@@ -54,21 +52,39 @@ class VCSExtraAlgTest extends AnyFunSuite with Matchers {
 
     vcsExtraAlg
       .getReleaseRelatedUrls(
-        SupportedVCS.GitHub,
-        uri"https://github.on-prem.com/",
+        uri"https://github.com/foo/buz",
+        updateBuz
+      )
+      .unsafeRunSync() shouldBe List.empty
+  }
+
+  test("getBranchCompareUrl: github on prem") {
+    implicit val cfg: Config = MockContext.config.copy(
+      vcsType = SupportedVCS.GitHub,
+      vcsApiHost = uri"https://github.on-prem.com/"
+    )
+    val githubOnPremVcsExtraAlg = VCSExtraAlg.create[IO]
+
+    githubOnPremVcsExtraAlg
+      .getReleaseRelatedUrls(
+        uri"https://github.on-prem.com/foo/foo",
+        updateFoo
+      )
+      .unsafeRunSync() shouldBe List.empty
+
+    githubOnPremVcsExtraAlg
+      .getReleaseRelatedUrls(
         uri"https://github.on-prem.com/foo/bar",
         updateBar
       )
       .unsafeRunSync() shouldBe List(
       ReleaseRelatedUrl.VersionDiff(uri"https://github.on-prem.com/foo/bar/compare/v0.1.0...v0.2.0")
     )
 
-    vcsExtraAlg
+    githubOnPremVcsExtraAlg
       .getReleaseRelatedUrls(
-        SupportedVCS.Gitlab,
-        uri"https://gitlab.com/",
-        uri"https://github.com/foo/buz",
-        updateBuz
+        uri"https://github.on-prem.com/foo/buz",
+        updateFoo
       )
       .unsafeRunSync() shouldBe List.empty
   }

modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala

@@ -145,14 +145,14 @@ class VCSPackageTest extends AnyFunSuite with Matchers {
       possibleReleaseNotesFilenames.map(name =>
         s"https://gitlab.on-prem.net/foo/bar/blob/master/$name"
       ) ++
-        possibleChangelogFilenames.map(name =>
-          s"https://gitlab.on-prem.net/foo/bar/blob/master/$name"
-        ) ++
-        List(
-          "https://gitlab.on-prem.net/foo/bar/compare/v1.2.0...v1.2.3",
-          "https://gitlab.on-prem.net/foo/bar/compare/1.2.0...1.2.3",
-          "https://gitlab.on-prem.net/foo/bar/compare/release-1.2.0...release-1.2.3"
-        )
+      possibleChangelogFilenames.map(name =>
+        s"https://gitlab.on-prem.net/foo/bar/blob/master/$name"
+      ) ++
+      List(
+        "https://gitlab.on-prem.net/foo/bar/compare/v1.2.0...v1.2.3",
+        "https://gitlab.on-prem.net/foo/bar/compare/1.2.0...1.2.3",
+        "https://gitlab.on-prem.net/foo/bar/compare/release-1.2.0...release-1.2.3"
+      )
   }
 
   test("possibleChangelogUrls: bitbucket.org") {