Prepare for integration with gh-bot-orchestrator

Author: radoslaw-panuszewski

allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/CliModule.kt

@@ -1,11 +1,10 @@
 package pl.allegro.tech.allwrite.cli
 
 import org.koin.core.annotation.Module
-import pl.allegro.tech.allwrite.runtime.RuntimeModule
 import pl.allegro.tech.allwrite.cli.application.ApplicationModule
 import pl.allegro.tech.allwrite.cli.infrastructure.os.OperatingSystemModule
-import pl.allegro.tech.allwrite.cli.infrastructure.pullrequestmanager.PullRequestManagerModule
 import pl.allegro.tech.allwrite.cli.util.ClockModule
+import pl.allegro.tech.allwrite.runtime.RuntimeModule
 
 /**
  * This module aggregates all core modules required for the CLI to work correctly.
@@ -17,6 +16,5 @@ import pl.allegro.tech.allwrite.cli.util.ClockModule
     RuntimeModule::class,
     OperatingSystemModule::class,
     ClockModule::class,
-    PullRequestManagerModule::class,
 ])
 public class CliModule

allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/Main.kt

@@ -5,21 +5,29 @@ import org.koin.core.context.startKoin
 import org.koin.ksp.generated.module
 import pl.allegro.tech.allwrite.kapt.GenerateCompletions
 import pl.allegro.tech.allwrite.cli.application.port.incoming.AppEntrypoint
+import pl.allegro.tech.allwrite.cli.infrastructure.bot.GithubBotModule
 import pl.allegro.tech.allwrite.cli.infrastructure.github.GithubModule
 import pl.allegro.tech.allwrite.cli.infrastructure.os.port.incoming.SystemEnvironment
 
 @GenerateCompletions
 public fun main(args: Array<String>) {
     startKoin {
         modules(CliModule().module)
-
-        if (env["GITHUB_ACTIONS"] == "true") {
-            modules(GithubModule().module)
-        }
-
+        loadDynamicModules()
         koin.get<AppEntrypoint>().execute(args)
     }
 }
 
+private fun KoinApplication.loadDynamicModules() {
+    val dynamicModules = mapOf(
+        "GITHUB_ACTIONS" to GithubModule().module,
+        "GH_BOT" to GithubBotModule().module
+    )
+    dynamicModules
+        .filterKeys { env[it] == "true" }
+        .values
+        .forEach(::modules)
+}
+
 private val KoinApplication.env: SystemEnvironment
     get() = koin.get<SystemEnvironment>()

allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/application/RunWithDependabotCommand.kt

@@ -84,7 +84,7 @@ internal class RunWithDependabotCommand(
 
     companion object {
 
-        const val ENV_VAR_RUN_DEPENDABOT_PAYLOAD_NAME: String = "PR_MANAGER_EXTRA_PARAMS"
+        const val ENV_VAR_RUN_DEPENDABOT_PAYLOAD_NAME: String = "GH_BOT_EXTRA_PARAMS"
         const val COMMAND_NAME: String = "run-dependabot"
     }
 }

…questmanager/PullRequestManagerModule.kt …li/infrastructure/bot/GithubBotModule.ktallwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/pullrequestmanager/PullRequestManagerModule.kt renamed to allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/bot/GithubBotModule.kt allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/pullrequestmanager/PullRequestManagerModule.kt renamed to allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/bot/GithubBotModule.kt

@@ -1,8 +1,8 @@
-package pl.allegro.tech.allwrite.cli.infrastructure.pullrequestmanager
+package pl.allegro.tech.allwrite.cli.infrastructure.bot
 
 import org.koin.core.annotation.ComponentScan
 import org.koin.core.annotation.Module
 
 @Module
 @ComponentScan
-public class PullRequestManagerModule
+public class GithubBotModule

…PullRequestManagerUserProblemReporter.kt …ture/bot/GithubBotUserProblemReporter.ktallwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/pullrequestmanager/PullRequestManagerUserProblemReporter.kt renamed to allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/bot/GithubBotUserProblemReporter.kt allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/pullrequestmanager/PullRequestManagerUserProblemReporter.kt renamed to allwrite-cli/src/main/kotlin/pl/allegro/tech/allwrite/cli/infrastructure/bot/GithubBotUserProblemReporter.kt

@@ -1,4 +1,4 @@
-package pl.allegro.tech.allwrite.cli.infrastructure.pullrequestmanager
+package pl.allegro.tech.allwrite.cli.infrastructure.bot
 
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.koin.core.annotation.Single
@@ -10,7 +10,7 @@ import java.io.File
 import java.io.PrintStream
 
 @Single
-internal class PullRequestManagerUserProblemReporter(
+internal class GithubBotUserProblemReporter(
     private val systemEnvironment: SystemEnvironment,
 ) : UserProblemReporter, ShutdownListener {
 
@@ -22,7 +22,7 @@ internal class PullRequestManagerUserProblemReporter(
 
     override fun onAppShutdown() {
         if (issues.isNotEmpty()) {
-            val commentOutput = systemEnvironment["PR_MANAGER_SUMMARY_COMMENT_FILE"]
+            val commentOutput = systemEnvironment["GH_BOT_SUMMARY_COMMENT_FILE"]
                 ?.let(::File)
                 ?.printWriter()
                 ?: fallbackOutput()

allwrite-cli/src/test/kotlin/pl/allegro/tech/allwrite/cli/CliIntegrationSpec.kt

@@ -7,6 +7,7 @@ import pl.allegro.tech.allwrite.cli.base.BaseCliSpec
 import pl.allegro.tech.allwrite.cli.fake.os.FakeOperatingSystemModule
 import pl.allegro.tech.allwrite.cli.fake.os.FakeSystemEnvironment
 import pl.allegro.tech.allwrite.cli.fake.recipes.FailingPostProcessingRecipe
+import pl.allegro.tech.allwrite.cli.infrastructure.bot.GithubBotModule
 import pl.allegro.tech.allwrite.runtime.util.injectEagerly
 import java.nio.file.Files
 import java.nio.file.Path
@@ -23,14 +24,15 @@ class CliIntegrationSpec : BaseCliSpec() {
     private val fakeSystemEnvironment: FakeSystemEnvironment by injectEagerly()
 
     override fun additionalModules() = listOf(
+        GithubBotModule().module,
         FakeOperatingSystemModule().module
     )
 
     init {
         test("should post a comment with summary from failing post-processing recipe") {
             // given
             val summaryCommentFile = createSummaryCommentFile()
-            fakeSystemEnvironment["PR_MANAGER_SUMMARY_COMMENT_FILE"] = summaryCommentFile.pathString
+            fakeSystemEnvironment["GH_BOT_SUMMARY_COMMENT_FILE"] = summaryCommentFile.pathString
 
             // when
             appEntrypoint.execute("run", "--recipe", FailingPostProcessingRecipe.name)

allwrite-cli/src/test/kotlin/pl/allegro/tech/allwrite/cli/RunWithDependabotCommandSpec.kt

@@ -40,7 +40,7 @@ class RunWithDependabotCommandSpec : BaseCliSpec() {
         test("should fail when incorrect dependabot payload provided") {
             shouldThrow<Exception> {
                 runWithDependabotCommand.test(
-                    envvars = mapOf("PR_MANAGER_EXTRA_PARAMS" to "test")
+                    envvars = mapOf("GH_BOT_EXTRA_PARAMS" to "test")
                 )
             }
         }

allwrite-runtime/src/main/kotlin/pl/allegro/tech/allwrite/runtime/OpenrewriteRecipeExecutor.kt

@@ -22,7 +22,7 @@ import kotlin.io.path.writeText
 @Single
 internal class OpenrewriteRecipeExecutor(
     private val sourceFilesParser: SourceFilesParser,
-    private val userProblemReporter: UserProblemReporter,
+    private val userProblemReporter: UserProblemReporter?,
 ) : RecipeExecutor {
 
     override fun execute(recipe: Recipe, inputFiles: List<Path>, failOnError: Boolean) {
@@ -77,7 +77,7 @@ internal class OpenrewriteRecipeExecutor(
                 postprocessingRecipe.postprocess()
             }
             .filterIsInstance<PostprocessingResult.Failure>()
-            .forEach { result -> userProblemReporter.reportProblem(Problem(result.errorMessage)) }
+            .forEach { result -> userProblemReporter?.reportProblem(Problem(result.errorMessage)) }
     }
 
     private fun allRecipes(recipe: Recipe): List<Recipe> =