refactor(workers): Simplify secret resolution

Use the later introduced function `SecretService.listForHierarchy` to
simplify the secret resolution in `EnvironmentConfigLoader`.

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

Author: mnonnenmacher

workers/analyzer/src/test/kotlin/AnalyzerEndpointTest.kt

@@ -59,14 +59,11 @@ import org.eclipse.apoapsis.ortserver.model.OrtRun
 import org.eclipse.apoapsis.ortserver.model.OrtRunStatus
 import org.eclipse.apoapsis.ortserver.model.Product
 import org.eclipse.apoapsis.ortserver.model.Repository
-import org.eclipse.apoapsis.ortserver.model.RepositoryId
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
 import org.eclipse.apoapsis.ortserver.model.Secret
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AnalyzerRequest
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AnalyzerWorkerError
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AnalyzerWorkerResult
-import org.eclipse.apoapsis.ortserver.model.util.ListQueryParameters
-import org.eclipse.apoapsis.ortserver.model.util.ListQueryResult
 import org.eclipse.apoapsis.ortserver.secrets.SecretsProviderFactoryForTesting
 import org.eclipse.apoapsis.ortserver.services.config.AdminConfig
 import org.eclipse.apoapsis.ortserver.services.config.AdminConfigService
@@ -314,8 +311,7 @@ class AnalyzerEndpointTest : KoinTest, StringSpec() {
             val usernameSecret = Secret(20230627040646L, "p1", "repositoryUsername", null, null, null, repository.id)
             val passwordSecret = Secret(20230627070543L, "p2", "repositoryPassword", null, null, null, repository.id)
             declareMock<SecretService> {
-                coEvery { listForId(RepositoryId(repository.id)) } returns
-                        ListQueryResult(listOf(usernameSecret, passwordSecret), ListQueryParameters.DEFAULT, 2)
+                coEvery { listForHierarchy(testHierarchy) } returns listOf(usernameSecret, passwordSecret)
             }
 
             declareMock<InfrastructureServiceService> {

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

@@ -33,7 +33,6 @@ import org.eclipse.apoapsis.ortserver.model.InfrastructureService
 import org.eclipse.apoapsis.ortserver.model.InfrastructureServiceDeclaration
 import org.eclipse.apoapsis.ortserver.model.OrganizationId
 import org.eclipse.apoapsis.ortserver.model.ProductId
-import org.eclipse.apoapsis.ortserver.model.RepositoryId
 import org.eclipse.apoapsis.ortserver.model.Secret
 import org.eclipse.apoapsis.ortserver.utils.logging.runBlocking
 import org.eclipse.apoapsis.ortserver.workers.common.env.definition.EnvironmentServiceDefinition
@@ -225,21 +224,13 @@ class EnvironmentConfigLoader(
             allSecretsNames += service.passwordSecret
         }
 
-        val resolvedSecrets = mutableMapOf<String, Secret>()
-
-        fun fetchSecrets(fetcher: suspend () -> List<Secret>) {
-            if (allSecretsNames.isNotEmpty()) {
-                val secrets = runBlocking { fetcher() }
-
-                val secretsMap = secrets.associateBy(Secret::name)
-                resolvedSecrets += secretsMap
-                allSecretsNames -= secretsMap.keys
-            }
+        val resolvedSecrets = if (allSecretsNames.isNotEmpty()) {
+            runBlocking { secretService.listForHierarchy(hierarchy) }.associateBy(Secret::name)
+        } else {
+            emptyMap()
         }
 
-        fetchSecrets { secretService.listForId(RepositoryId(hierarchy.repository.id)).data }
-        fetchSecrets { secretService.listForId(ProductId(hierarchy.product.id)).data }
-        fetchSecrets { secretService.listForId(OrganizationId(hierarchy.organization.id)).data }
+        allSecretsNames -= resolvedSecrets.keys
 
         if (allSecretsNames.isNotEmpty()) {
             val message = "Invalid secret names. The following names cannot be resolved: $allSecretsNames"

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

@@ -34,7 +34,6 @@ import io.kotest.matchers.string.shouldContain
 
 import io.mockk.coEvery
 import io.mockk.coVerify
-import io.mockk.every
 import io.mockk.mockk
 
 import java.io.File
@@ -53,7 +52,6 @@ import org.eclipse.apoapsis.ortserver.model.OrganizationId
 import org.eclipse.apoapsis.ortserver.model.Product
 import org.eclipse.apoapsis.ortserver.model.ProductId
 import org.eclipse.apoapsis.ortserver.model.Repository
-import org.eclipse.apoapsis.ortserver.model.RepositoryId
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
 import org.eclipse.apoapsis.ortserver.model.Secret
 import org.eclipse.apoapsis.ortserver.model.util.ListQueryParameters
@@ -182,7 +180,7 @@ class EnvironmentConfigLoaderTest : StringSpec({
 
         // There should be only one call for the repository hierarchy.
         coVerify(exactly = 1) {
-            helper.secretService.listForId(any(), any())
+            helper.secretService.listForHierarchy(any())
         }
     }
 
@@ -544,21 +542,11 @@ private class TestHelper(
      */
     private fun initSecretRepository() {
         coEvery {
-            secretService.listForId(RepositoryId(repository.id))
-        } returns mockk<ListQueryResult<Secret>> {
-            every { data } returns secrets.filter { it.repositoryId != null }
-        }
-
-        coEvery {
-            secretService.listForId(ProductId(product.id))
-        } returns mockk<ListQueryResult<Secret>> {
-            every { data } returns secrets.filter { it.productId != null }
-        }
-
-        coEvery {
-            secretService.listForId(OrganizationId(organization.id))
-        } returns mockk<ListQueryResult<Secret>> {
-            every { data } returns secrets.filter { it.organizationId != null }
+            secretService.listForHierarchy(Hierarchy(repository, product, organization))
+        } returns buildList {
+            addAll(secrets.filter { it.repositoryId == repository.id })
+            addAll(secrets.filter { it.productId == product.id && none { secret -> secret.name == it.name } })
+            addAll(secrets.filter { it.organizationId == organization.id && none { secret -> secret.name == it.name } })
         }
     }