Remove GitHub App code from core

scala-steward-org · Dec 20, 2023 · 75ebd2c · 75ebd2c
1 parent a3a2507
commit 75ebd2c
Show file tree

Hide file tree

Showing 18 changed files with 901 additions and 69 deletions.
diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,8 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map(
   "benchmark" -> List(JVMPlatform),
   "core" -> List(JVMPlatform),
   "docs" -> List(JVMPlatform),
-  "dummy" -> List(JVMPlatform)
+  "dummy" -> List(JVMPlatform),
+  "gh-app-facade" -> List(JVMPlatform)
 )
 
 val Scala213 = "2.13.12"
@@ -111,7 +112,6 @@ lazy val core = myCrossProject("core")
   .settings(dockerSettings)
   .settings(
     libraryDependencies ++= Seq(
-      Dependencies.bcprovJdk15to18,
       Dependencies.betterFiles,
       Dependencies.catsCore,
       Dependencies.catsEffect,
@@ -132,9 +132,6 @@ lazy val core = myCrossProject("core")
       Dependencies.http4sClient,
       Dependencies.http4sCore,
       Dependencies.http4sJdkhttpClient,
-      Dependencies.jjwtApi,
-      Dependencies.jjwtImpl % Runtime,
-      Dependencies.jjwtJackson % Runtime,
       Dependencies.log4catsSlf4j,
       Dependencies.monocleCore,
       Dependencies.refined,
@@ -276,6 +273,17 @@ lazy val dummy = myCrossProject("dummy")
     )
   )
 
+lazy val ghAppFacade = myCrossProject("gh-app-facade")
+  .dependsOn(core)
+  .settings(
+    libraryDependencies ++= Seq(
+      Dependencies.bcprovJdk15to18,
+      Dependencies.jjwtApi,
+      Dependencies.jjwtImpl % Runtime,
+      Dependencies.jjwtJackson % Runtime
+    )
+  )
+
 /// settings
 
 def myCrossProject(name: String): CrossProject =

diff --git a/modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala b/modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala
@@ -27,7 +27,6 @@ import org.scalasteward.core.application.Config._
 import org.scalasteward.core.data.Resolver
 import org.scalasteward.core.forge.ForgeType
 import org.scalasteward.core.forge.ForgeType.{AzureRepos, GitHub}
-import org.scalasteward.core.forge.github.GitHubApp
 import org.scalasteward.core.git.Author
 import org.scalasteward.core.util.Nel
 import org.scalasteward.core.util.dateTime.renderFiniteDuration
@@ -291,21 +290,6 @@ object Cli {
       GitLabCfg.apply
     )
 
-  private val githubAppId: Opts[Long] =
-    option[Long](
-      "github-app-id",
-      "GitHub application id. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required."
-    )
-
-  private val githubAppKeyFile: Opts[File] =
-    option[File](
-      "github-app-key-file",
-      "GitHub application key file. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required."
-    )
-
-  private val gitHubApp: Opts[Option[GitHubApp]] =
-    (githubAppId, githubAppKeyFile).mapN(GitHubApp.apply).orNone
-
   private val azureReposOrganization: Opts[Option[String]] =
     option[String](
       "azure-repos-organization",
@@ -352,7 +336,6 @@ object Cli {
     bitbucketServerCfg,
     gitLabCfg,
     azureReposCfg,
-    gitHubApp,
     urlCheckerTestUrls,
     defaultMavenRepo,
     refreshBackoffPeriod

diff --git a/modules/core/src/main/scala/org/scalasteward/core/application/Config.scala b/modules/core/src/main/scala/org/scalasteward/core/application/Config.scala
@@ -26,7 +26,6 @@ import org.scalasteward.core.application.Config._
 import org.scalasteward.core.data.Resolver
 import org.scalasteward.core.forge.ForgeType
 import org.scalasteward.core.forge.data.AuthenticatedUser
-import org.scalasteward.core.forge.github.GitHubApp
 import org.scalasteward.core.git.Author
 import org.scalasteward.core.io.{ProcessAlg, WorkspaceAlg}
 import org.scalasteward.core.util
@@ -66,7 +65,6 @@ final case class Config(
     bitbucketServerCfg: BitbucketServerCfg,
     gitLabCfg: GitLabCfg,
     azureReposCfg: AzureReposCfg,
-    githubApp: Option[GitHubApp],
     urlCheckerTestUrls: Nel[Uri],
     defaultResolver: Resolver,
     refreshBackoffPeriod: FiniteDuration

diff --git a/modules/core/src/main/scala/org/scalasteward/core/application/Context.scala b/modules/core/src/main/scala/org/scalasteward/core/application/Context.scala
@@ -36,7 +36,6 @@ import org.scalasteward.core.edit.EditAlg
 import org.scalasteward.core.edit.hooks.HookExecutor
 import org.scalasteward.core.edit.scalafix._
 import org.scalasteward.core.edit.update.ScannerAlg
-import org.scalasteward.core.forge.github.{GitHubAppApiAlg, GitHubAuthAlg}
 import org.scalasteward.core.forge.{ForgeApiAlg, ForgeRepoAlg, ForgeSelection}
 import org.scalasteward.core.git.{GenGitAlg, GitAlg}
 import org.scalasteward.core.io.{FileAlg, ProcessAlg, WorkspaceAlg}
@@ -159,7 +158,6 @@ object Context {
       implicit val repoConfigAlg: RepoConfigAlg[F] = new RepoConfigAlg[F](maybeGlobalRepoConfig)
       implicit val filterAlg: FilterAlg[F] = new FilterAlg[F]
       implicit val gitAlg: GitAlg[F] = GenGitAlg.create[F](config.gitCfg)
-      implicit val gitHubAuthAlg: GitHubAuthAlg[F] = GitHubAuthAlg.create[F]
       implicit val hookExecutor: HookExecutor[F] = new HookExecutor[F]
       implicit val httpJsonClient: HttpJsonClient[F] = new HttpJsonClient[F]
       implicit val repoCacheRepository: RepoCacheRepository[F] =
@@ -191,8 +189,6 @@ object Context {
       implicit val nurtureAlg: NurtureAlg[F] = new NurtureAlg[F](config.forgeCfg)
       implicit val pruningAlg: PruningAlg[F] = new PruningAlg[F]
       implicit val reposFilesLoader: ReposFilesLoader[F] = new ReposFilesLoader[F]
-      implicit val gitHubAppApiAlg: GitHubAppApiAlg[F] =
-        new GitHubAppApiAlg[F](config.forgeCfg.apiHost)
       implicit val stewardAlg: StewardAlg[F] = new StewardAlg[F](config)
       new Context[F]
     }

diff --git a/modules/core/src/main/scala/org/scalasteward/core/application/StewardAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/application/StewardAlg.scala
@@ -18,9 +18,7 @@ package org.scalasteward.core.application
 
 import cats.effect.{ExitCode, Sync}
 import cats.syntax.all._
-import fs2.Stream
 import org.scalasteward.core.data.Repo
-import org.scalasteward.core.forge.github.{GitHubApp, GitHubAppApiAlg, GitHubAuthAlg}
 import org.scalasteward.core.git.GitAlg
 import org.scalasteward.core.io.{FileAlg, WorkspaceAlg}
 import org.scalasteward.core.nurture.NurtureAlg
@@ -30,14 +28,11 @@ import org.scalasteward.core.util
 import org.scalasteward.core.util.DateTimeAlg
 import org.scalasteward.core.util.logger.LoggerOps
 import org.typelevel.log4cats.Logger
-import scala.concurrent.duration._
 
 final class StewardAlg[F[_]](config: Config)(implicit
     dateTimeAlg: DateTimeAlg[F],
     fileAlg: FileAlg[F],
     gitAlg: GitAlg[F],
-    githubAppApiAlg: GitHubAppApiAlg[F],
-    githubAuthAlg: GitHubAuthAlg[F],
     logger: Logger[F],
     nurtureAlg: NurtureAlg[F],
     pruningAlg: PruningAlg[F],
@@ -47,25 +42,6 @@ final class StewardAlg[F[_]](config: Config)(implicit
     workspaceAlg: WorkspaceAlg[F],
     F: Sync[F]
 ) {
-  private def getGitHubAppRepos(githubApp: GitHubApp): Stream[F, Repo] =
-    Stream.evals[F, List, Repo] {
-      for {
-        jwt <- githubAuthAlg.createJWT(githubApp, 2.minutes)
-        installations <- githubAppApiAlg.installations(jwt)
-        repositories <- installations.traverse { installation =>
-          githubAppApiAlg
-            .accessToken(jwt, installation.id)
-            .flatMap(token => githubAppApiAlg.repositories(token.token))
-        }
-        repos <- repositories.flatMap(_.repositories).flatTraverse { repo =>
-          repo.full_name.split('/') match {
-            case Array(owner, name) => F.pure(List(Repo(owner, name)))
-            case _                  => logger.error(s"invalid repo $repo").as(List.empty[Repo])
-          }
-        }
-      } yield repos
-    }
-
   private def steward(repo: Repo): F[Either[Throwable, Unit]] = {
     val label = s"Steward ${repo.show}"
     logger.infoTotalTime(label) {
@@ -87,19 +63,18 @@ final class StewardAlg[F[_]](config: Config)(implicit
       for {
         _ <- selfCheckAlg.checkAll
         _ <- workspaceAlg.removeAnyRunSpecificFiles
-        exitCode <-
-          (config.githubApp.map(getGitHubAppRepos).getOrElse(Stream.empty) ++
-            reposFilesLoader.loadAll(config.reposFiles))
-            .evalMap(repo => steward(repo).map(_.bimap(repo -> _, _ => repo)))
-            .compile
-            .toList
-            .flatMap { results =>
-              val runResults = RunResults(results)
-              for {
-                summaryFile <- workspaceAlg.runSummaryFile
-                _ <- fileAlg.writeFile(summaryFile, runResults.markdownSummary)
-              } yield runResults.exitCode
-            }
+        exitCode <- reposFilesLoader
+          .loadAll(config.reposFiles)
+          .evalMap(repo => steward(repo).map(_.bimap(repo -> _, _ => repo)))
+          .compile
+          .toList
+          .flatMap { results =>
+            val runResults = RunResults(results)
+            for {
+              summaryFile <- workspaceAlg.runSummaryFile
+              _ <- fileAlg.writeFile(summaryFile, runResults.markdownSummary)
+            } yield runResults.exitCode
+          }
       } yield exitCode
     }
 }
diff --git a/modules/core/src/test/scala/org/scalasteward/core/application/CliTest.scala b/modules/core/src/test/scala/org/scalasteward/core/application/CliTest.scala
@@ -7,7 +7,6 @@ import org.http4s.syntax.literals._
 import org.scalasteward.core.application.Cli.ParseResult._
 import org.scalasteward.core.application.Cli.{EnvVar, Usage}
 import org.scalasteward.core.forge.ForgeType
-import org.scalasteward.core.forge.github.GitHubApp
 import org.scalasteward.core.util.Nel
 import scala.concurrent.duration._
 
@@ -30,8 +29,6 @@ class CliTest extends FunSuite {
         List("--scalafix-migrations", "/opt/scala-steward/extra-scalafix-migrations.conf"),
         List("--artifact-migrations", "/opt/scala-steward/extra-artifact-migrations.conf"),
         List("--repo-config", "/opt/scala-steward/scala-steward.conf"),
-        List("--github-app-id", "12345678"),
-        List("--github-app-key-file", "example_app_key"),
         List("--refresh-backoff-period", "1 day"),
         List("--bitbucket-use-default-reviewers")
       ).flatten
@@ -60,7 +57,6 @@ class CliTest extends FunSuite {
       obtained.artifactCfg.migrations,
       List(uri"/opt/scala-steward/extra-artifact-migrations.conf")
     )
-    assertEquals(obtained.githubApp, Some(GitHubApp(12345678L, File("example_app_key"))))
     assertEquals(obtained.refreshBackoffPeriod, 1.day)
     assert(!obtained.gitLabCfg.mergeWhenPipelineSucceeds)
     assertEquals(obtained.gitLabCfg.requiredReviewers, None)