refactor(workers): Make a resolve function suspending

Make the `resolve` function of `EnvironmentConfigLoader` suspending to
avoid a `runBlocking` call.

Signed-off-by: Martin Nonnenmacher <[email protected]>

Author: mnonnenmacher

workers/common/src/main/kotlin/common/env/config/EnvironmentConfigLoader.kt

@@ -158,7 +158,7 @@ class EnvironmentConfigLoader(
      * environment configuration for the repository is not read from the source code, but passed when triggering the
      * run.
      */
-    fun resolve(config: EnvironmentConfig, hierarchy: Hierarchy): ResolvedEnvironmentConfig {
+    suspend fun resolve(config: EnvironmentConfig, hierarchy: Hierarchy): ResolvedEnvironmentConfig {
         val repositoryConfig = RepositoryEnvironmentConfig(
             infrastructureServices = config.infrastructureServices.map { it.toRepositoryService() },
             environmentDefinitions = config.environmentDefinitions,
@@ -173,7 +173,7 @@ class EnvironmentConfigLoader(
      * Resolve the declarations in the given [config] using the provided [hierarchy]. Handle references that cannot be
      * resolved according to the `strict` flag in the configuration.
      */
-    private fun resolveRepositoryEnvironmentConfig(
+    private suspend fun resolveRepositoryEnvironmentConfig(
         config: RepositoryEnvironmentConfig,
         hierarchy: Hierarchy
     ): ResolvedEnvironmentConfig {
@@ -216,7 +216,7 @@ class EnvironmentConfigLoader(
      * repository. Return a [Map] with the resolved secrets keyed by their names. Depending on the strict flag, fail
      * if secrets cannot be resolved.
      */
-    private fun resolveSecrets(config: RepositoryEnvironmentConfig, hierarchy: Hierarchy): Map<String, Secret> {
+    private suspend fun resolveSecrets(config: RepositoryEnvironmentConfig, hierarchy: Hierarchy): Map<String, Secret> {
         val allSecretsNames = mutableSetOf<String>()
         allSecretsNames += config.environmentVariables.mapNotNull { it.secretName }
         config.infrastructureServices.forEach { service ->
@@ -225,7 +225,7 @@ class EnvironmentConfigLoader(
         }
 
         val resolvedSecrets = if (allSecretsNames.isNotEmpty()) {
-            runBlocking { secretService.listForHierarchy(hierarchy) }.associateBy(Secret::name)
+            secretService.listForHierarchy(hierarchy).associateBy(Secret::name)
         } else {
             emptyMap()
         }

workers/common/src/test/kotlin/common/env/EnvironmentServiceTest.kt

@@ -115,7 +115,7 @@ class EnvironmentServiceTest : WordSpec({
 
             val config = mockk<EnvironmentConfig>()
             val configLoader = mockk<EnvironmentConfigLoader> {
-                every { resolve(config, any()) } returns ResolvedEnvironmentConfig(services)
+                coEvery { resolve(config, any()) } returns ResolvedEnvironmentConfig(services)
             }
 
             val service = mockk<InfrastructureServiceService> {
@@ -146,7 +146,7 @@ class EnvironmentServiceTest : WordSpec({
 
             val config = mockk<EnvironmentConfig>()
             val configLoader = mockk<EnvironmentConfigLoader> {
-                every {
+                coEvery {
                     resolve(config, any())
                 } returns ResolvedEnvironmentConfig(listOf(configService, overrideService))
             }
@@ -878,7 +878,7 @@ private fun mockConfigLoader(config: ResolvedEnvironmentConfig): EnvironmentConf
 
     return mockk<EnvironmentConfigLoader> {
         every { resolveAndParse(repositoryFolder) } returns envConfig
-        every { resolve(any(), repositoryHierarchy) } returns config
+        coEvery { resolve(any(), repositoryHierarchy) } returns config
     }
 }
 
@@ -897,7 +897,7 @@ private fun mockConfigLoader(
 
     return mockk {
         every { resolveAndParse(repositoryFolder) } returns mockConfig
-        every { resolve(envConfig, repositoryHierarchy) } returns resultConfig
+        coEvery { resolve(envConfig, repositoryHierarchy) } returns resultConfig
     }
 }
 

workers/common/src/test/kotlin/common/env/config/EnvironmentConfigLoaderTest.kt

@@ -467,7 +467,7 @@ private fun TestConfiguration.parseConfig(name: String, helper: TestHelper): Env
 /**
  * Resolve the test configuration using the given [helper].
  */
-private fun EnvironmentConfig.resolve(helper: TestHelper): ResolvedEnvironmentConfig =
+private suspend fun EnvironmentConfig.resolve(helper: TestHelper): ResolvedEnvironmentConfig =
     helper.loader().resolve(this, hierarchy)
 
 /**