Make the check solution's image optianal so we can desactivate it in local

Author: michel-guillon

api/kubernetes/helm-chart/values-dev.yaml

@@ -73,5 +73,6 @@ config:
         containerRegistries:
           solutions: "localhost:5000"
       containerRegistry:
-        provider: local
-        registryUrl: "localhost:5000"
+        registryUrl: "https://csmenginesdev.azurecr.io"
+        registryUserName: "user-name"
+        registryPassword: "a-super-secret-password"

build.gradle.kts

@@ -48,7 +48,7 @@ group = "com.cosmotech"
 version = scmVersion.version
 
 val kotlinJvmTarget = 17
-val cosmotechApiCommonVersion = "0.2.0"
+val cosmotechApiCommonVersion = "0.2.1-SNAPSHOT"
 val cosmotechApiAzureVersion = "0.1.12-SNAPSHOT"
 val azureSpringBootBomVersion = "3.14.0"
 val jedisVersion = "3.9.0"

scenariorun/src/main/kotlin/com/cosmotech/scenariorun/ContainerFactory.kt

@@ -5,7 +5,7 @@ package com.cosmotech.scenariorun
 import com.cosmotech.api.azure.sanitizeForAzureStorage
 import com.cosmotech.api.config.CsmPlatformProperties
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.Strategy.SHARED_ACCESS_POLICY
-import com.cosmotech.api.containerregistry.RegistryClient
+import com.cosmotech.api.containerregistry.ContainerRegistryService
 import com.cosmotech.api.utils.sanitizeForKubernetes
 import com.cosmotech.connector.api.ConnectorApiService
 import com.cosmotech.connector.domain.Connector
@@ -153,7 +153,7 @@ class ContainerFactory(
     private val connectorService: ConnectorApiService,
     private val datasetService: DatasetApiService,
     private val workspaceEventHubService: IWorkspaceEventHubService,
-    private val containerRegistryClient: RegistryClient
+    private val containerRegistryService: ContainerRegistryService
 ) {
 
   private val logger = LoggerFactory.getLogger(ContainerFactory::class.java)
@@ -246,7 +246,10 @@ class ContainerFactory(
         throw IllegalStateException("You cannot start a workspace with no solutionId defined")
     val solution =
         solutionService.findSolutionById(organizationId, workspace.solution.solutionId ?: "")
-    containerRegistryClient.checkSolutionImage(solution.repository!!, solution.version!!)
+
+    if (csmPlatformProperties.containerRegistry.checkSolutionImage) {
+      containerRegistryService.checkSolutionImage(solution.repository!!, solution.version!!)
+    }
 
     val scenario = scenarioService.findScenarioById(organizationId, workspaceId, scenarioId)
     val runTemplate = this.getRunTemplate(solution, (scenario.runTemplateId ?: ""))

scenariorun/src/test/kotlin/com/cosmotech/scenariorun/ContainerFactoryTests.kt

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 package com.cosmotech.scenariorun
 
-import com.cosmotech.api.azure.containerregistry.AzureContainerRegistryClient
 import com.cosmotech.api.config.CsmPlatformProperties
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureCredentials
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureCredentials.CsmPlatformAzureCredentialsCore
@@ -12,6 +11,7 @@ import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatfo
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.SharedAccessPolicyDetails
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.Strategy.SHARED_ACCESS_POLICY
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.Strategy.TENANT_CLIENT_CREDENTIALS
+import com.cosmotech.api.containerregistry.ContainerRegistryService
 import com.cosmotech.api.exceptions.CsmClientException
 import com.cosmotech.api.utils.SecretManager
 import com.cosmotech.connector.api.ConnectorApiService
@@ -79,7 +79,7 @@ class ContainerFactoryTests {
   @MockK private lateinit var connectorService: ConnectorApiService
   @MockK private lateinit var datasetService: DatasetApiService
   @MockK private lateinit var secretManager: SecretManager
-  @MockK private lateinit var azureContainerRegistryClient: AzureContainerRegistryClient
+  @MockK private lateinit var containerRegistryService: ContainerRegistryService
   private lateinit var workspaceEventHubService: IWorkspaceEventHubService
 
   private lateinit var factory: ContainerFactory
@@ -170,7 +170,7 @@ class ContainerFactoryTests {
             connectorService,
             datasetService,
             workspaceEventHubService,
-            azureContainerRegistryClient)
+            containerRegistryService)
   }
 
   @Test
@@ -2586,7 +2586,7 @@ class ContainerFactoryTests {
     every { connectorService.findConnectorById("AzErTyUiOp") } returns getConnector()
     every { connectorService.findConnectorById("AzErTyUiOp2") } returns getConnector2()
     every { connectorService.findConnectorById("AzErTyUiOp3") } returns getConnector3()
-    every { azureContainerRegistryClient.checkSolutionImage(any(), any()) } returns Unit
+    every { containerRegistryService.checkSolutionImage(any(), any()) } returns Unit
 
     return factory.getStartInfo(
         organizationId,

scenariorun/src/test/kotlin/com/cosmotech/scenariorun/OktaContainerFactoryTests.kt

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 package com.cosmotech.scenariorun
 
-import com.cosmotech.api.azure.containerregistry.AzureContainerRegistryClient
 import com.cosmotech.api.config.CsmPlatformProperties
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureCredentials
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureCredentials.CsmPlatformAzureCredentialsCore
@@ -12,6 +11,7 @@ import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatfo
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.SharedAccessPolicyDetails
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.Strategy.SHARED_ACCESS_POLICY
 import com.cosmotech.api.config.CsmPlatformProperties.CsmPlatformAzure.CsmPlatformAzureEventBus.Authentication.Strategy.TENANT_CLIENT_CREDENTIALS
+import com.cosmotech.api.containerregistry.ContainerRegistryService
 import com.cosmotech.api.exceptions.CsmClientException
 import com.cosmotech.api.utils.SecretManager
 import com.cosmotech.connector.api.ConnectorApiService
@@ -79,7 +79,7 @@ class OktaContainerFactoryTests {
   @MockK private lateinit var connectorService: ConnectorApiService
   @MockK private lateinit var datasetService: DatasetApiService
   @MockK private lateinit var secretManager: SecretManager
-  @MockK private lateinit var azureContainerRegistryClient: AzureContainerRegistryClient
+  @MockK private lateinit var containerRegistryService: ContainerRegistryService
   private lateinit var workspaceEventHubService: IWorkspaceEventHubService
 
   private lateinit var factory: ContainerFactory
@@ -177,7 +177,7 @@ class OktaContainerFactoryTests {
             connectorService,
             datasetService,
             workspaceEventHubService,
-            azureContainerRegistryClient,
+            containerRegistryService,
         )
   }
 
@@ -2566,7 +2566,7 @@ class OktaContainerFactoryTests {
     every { connectorService.findConnectorById("AzErTyUiOp") } returns getConnector()
     every { connectorService.findConnectorById("AzErTyUiOp2") } returns getConnector2()
     every { connectorService.findConnectorById("AzErTyUiOp3") } returns getConnector3()
-    every { azureContainerRegistryClient.checkSolutionImage(any(), any()) } returns Unit
+    every { containerRegistryService.checkSolutionImage(any(), any()) } returns Unit
 
     return factory.getStartInfo(
         organizationId,