Refactor runner datasets management

- Replaced `datasetList` field with `datasets` object in `Runner` to differentiate base datasets and parameter datasets.
- Updated related services, tests, and API documentation to align with the new `datasets` structure.
- Introduced `RunnerDatasets` model to handle `bases` and `parameter` datasets separately.
- Adjusted integration tests to include usage of `RunnerDatasets`.

Author: jreynard-code

doc/.openapi-generator/FILES

@@ -56,6 +56,7 @@ Models/RunTemplateUpdateRequest.md
 Models/Runner.md
 Models/RunnerAccessControl.md
 Models/RunnerCreateRequest.md
+Models/RunnerDatasets.md
 Models/RunnerEditInfo.md
 Models/RunnerResourceSizing.md
 Models/RunnerRole.md

doc/Models/Runner.md

@@ -18,7 +18,7 @@
 | **ownerName** | **String** | the name of the owner | [default to null] |
 | **solutionName** | **String** | the Solution name | [optional] [default to null] |
 | **runTemplateName** | **String** | the Solution Run Template name associated with this Runner | [optional] [default to null] |
-| **datasetList** | **List** | the list of Dataset Id associated to this Runner Run Template | [default to null] |
+| **datasets** | [**RunnerDatasets**](RunnerDatasets.md) |  | [default to null] |
 | **runSizing** | [**RunnerResourceSizing**](RunnerResourceSizing.md) |  | [optional] [default to null] |
 | **parametersValues** | [**List**](RunnerRunTemplateParameterValue.md) | the list of Solution Run Template parameters values | [default to null] |
 | **lastRunInfo** | [**LastRunInfo**](LastRunInfo.md) |  | [default to null] |

doc/README.md

@@ -170,6 +170,7 @@ All URIs are relative to *http://localhost:8080*
  - [Runner](./Models/Runner.md)
  - [RunnerAccessControl](./Models/RunnerAccessControl.md)
  - [RunnerCreateRequest](./Models/RunnerCreateRequest.md)
+ - [RunnerDatasets](./Models/RunnerDatasets.md)
  - [RunnerEditInfo](./Models/RunnerEditInfo.md)
  - [RunnerResourceSizing](./Models/RunnerResourceSizing.md)
  - [RunnerRole](./Models/RunnerRole.md)

openapi/plantuml/schemas.plantuml

@@ -388,7 +388,7 @@ entity Runner {
     * ownerName: String
     solutionName: String
     runTemplateName: String
-    * datasetList: List<String>
+    * datasets: RunnerDatasets
     runSizing: RunnerResourceSizing
     * parametersValues: List<RunnerRunTemplateParameterValue>
     * lastRunInfo: LastRunInfo
@@ -417,6 +417,11 @@ entity RunnerCreateRequest {
     security: RunnerSecurity
 }
 
+entity RunnerDatasets {
+    * bases: List<String>
+    * parameter: String
+}
+
 entity RunnerEditInfo {
     * timestamp: Long
     * userId: String
@@ -640,6 +645,7 @@ SolutionUpdateRequest -- "0..*" RunTemplateCreateRequest : runTemplates
 OrganizationCreateRequest -- OrganizationSecurity : security
 Runner -- RunnerEditInfo : createInfo
 Runner -- RunnerEditInfo : updateInfo
+Runner -- RunnerDatasets : datasets
 Runner -- RunnerResourceSizing : runSizing
 Runner -- "0..*" RunnerRunTemplateParameterValue : parametersValues
 Runner -- LastRunInfo : lastRunInfo

run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt

@@ -36,6 +36,7 @@ import com.cosmotech.runner.domain.LastRunInfo.LastRunStatus
 import com.cosmotech.runner.domain.Runner
 import com.cosmotech.runner.domain.RunnerAccessControl
 import com.cosmotech.runner.domain.RunnerCreateRequest
+import com.cosmotech.runner.domain.RunnerDatasets
 import com.cosmotech.runner.domain.RunnerEditInfo
 import com.cosmotech.runner.domain.RunnerSecurity
 import com.cosmotech.runner.domain.RunnerValidationStatus
@@ -261,7 +262,7 @@ class RunServiceIntegrationTest : CsmTestBase() {
                     timestamp = Instant.now().toEpochMilli(),
                     userId = getCurrentAccountIdentifier(csmPlatformProperties)),
             ownerName = "owner",
-            datasetList = mutableListOf(),
+            datasets = RunnerDatasets(bases = mutableListOf(), parameter = ""),
             workspaceId = workspaceId,
             validationStatus = RunnerValidationStatus.Draft,
             parametersValues = mutableListOf(),

run/src/main/kotlin/com/cosmotech/run/service/RunServiceImpl.kt

@@ -585,7 +585,7 @@ class RunServiceImpl(
             runTemplateId = startInfo.runTemplate.id,
             generateName = startInfo.startContainers.generateName,
             computeSize = startInfo.runTemplate.computeSize,
-            datasetList = runner.datasetList,
+            datasetList = runner.datasets.bases + runner.datasets.parameter,
             createInfo =
                 RunEditInfo(
                     timestamp = now, userId = getCurrentAccountIdentifier(csmPlatformProperties)),

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

@@ -19,6 +19,7 @@ import com.cosmotech.runner.domain.LastRunInfo
 import com.cosmotech.runner.domain.LastRunInfo.LastRunStatus
 import com.cosmotech.runner.domain.Runner
 import com.cosmotech.runner.domain.RunnerAccessControl
+import com.cosmotech.runner.domain.RunnerDatasets
 import com.cosmotech.runner.domain.RunnerEditInfo
 import com.cosmotech.runner.domain.RunnerRunTemplateParameterValue
 import com.cosmotech.runner.domain.RunnerSecurity
@@ -223,7 +224,7 @@ class ContainerFactoryTests {
         id = "RunnerId",
         name = "TestRunner",
         runTemplateId = CSM_RUN_TEMPLATE_ID,
-        datasetList = mutableListOf("1", "2"),
+        datasets = RunnerDatasets(bases = mutableListOf("1", "2"), parameter = "3"),
         solutionId = "solution",
         organizationId = "organization",
         workspaceId = "workspace",

runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt

@@ -464,12 +464,10 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
     assertEquals(runnerAccessControl, runnerAccessControlRegistered)
 
     logger.info(
-        "should add an Access Control and assert it is the one created in the linked datasets")
-    runnerSaved.datasetList.forEach {
-      assertDoesNotThrow {
-        datasetApiService.getDatasetAccessControl(
-            organizationSaved.id, workspaceSaved.id, it, TEST_USER_MAIL)
-      }
+        "should add an Access Control and assert it is the one created in the parameter dataset")
+    assertDoesNotThrow {
+      datasetApiService.getDatasetAccessControl(
+          organizationSaved.id, workspaceSaved.id, runnerSaved.datasets.parameter, TEST_USER_MAIL)
     }
 
     logger.info("should update the Access Control and assert it has been updated")
@@ -482,14 +480,17 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
             RunnerRole(ROLE_EDITOR))
     assertEquals(ROLE_EDITOR, runnerAccessControlRegistered.role)
 
-    logger.info("Should not change the datasets access control because ACL already exist on it")
-    runnerSaved.datasetList.forEach {
-      assertEquals(
-          ROLE_VIEWER,
-          datasetApiService
-              .getDatasetAccessControl(organizationSaved.id, workspaceSaved.id, it, TEST_USER_MAIL)
-              .role)
-    }
+    logger.info(
+        "Should not change the parameter dataset access control because ACL already exist on it")
+    assertEquals(
+        ROLE_VIEWER,
+        datasetApiService
+            .getDatasetAccessControl(
+                organizationSaved.id,
+                workspaceSaved.id,
+                runnerSaved.datasets.parameter,
+                TEST_USER_MAIL)
+            .role)
 
     logger.info("should get the list of users and assert there are 2")
     val userList =
@@ -506,12 +507,10 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
     }
 
     logger.info(
-        "should remove the Access Control and assert it has been removed in the linked datasets")
-    runnerSaved.datasetList.forEach {
-      assertThrows<CsmResourceNotFoundException> {
-        datasetApiService.getDatasetAccessControl(
-            organizationSaved.id, workspaceSaved.id, it, TEST_USER_MAIL)
-      }
+        "should remove the Access Control and assert it has been removed in the parameter dataset")
+    assertThrows<CsmResourceNotFoundException> {
+      datasetApiService.getDatasetAccessControl(
+          organizationSaved.id, workspaceSaved.id, runnerSaved.datasets.parameter, TEST_USER_MAIL)
     }
   }
 
@@ -577,14 +576,24 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
   }
 
   @Test
-  fun `test on runner delete keep datasets`() {
+  fun `test on runner delete keep bases datasets but not parameters dataset`() {
     runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
 
-    runnerSaved.datasetList.forEach { dataset ->
+    runnerSaved.datasets.bases.forEach { dataset ->
       assertDoesNotThrow {
         datasetApiService.getDataset(organizationSaved.id, workspaceSaved.id, dataset)
       }
     }
+    val parameterDatasetId = runnerSaved.datasets.parameter
+    val exception =
+        assertThrows<CsmResourceNotFoundException> {
+          datasetApiService.getDataset(organizationSaved.id, workspaceSaved.id, parameterDatasetId)
+        }
+    assertEquals(
+        "Dataset $parameterDatasetId not found " +
+            "in organization ${organizationSaved.id} " +
+            "and workspace ${workspaceSaved.id}",
+        exception.message)
   }
 
   @Test
@@ -602,7 +611,8 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
     val childRunnerDatasetList =
         runnerApiService
             .createRunner(organizationSaved.id, workspaceSaved.id, childRunnerWithNullDatasetList)
-            .datasetList
+            .datasets
+            .bases
 
     assertNotNull(childRunnerDatasetList)
     assertTrue { childRunnerDatasetList.isEmpty() }
@@ -626,7 +636,8 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
     val childRunnerDatasetList =
         runnerApiService
             .createRunner(organizationSaved.id, workspaceSaved.id, childRunnerWithNullDatasetList)
-            .datasetList
+            .datasets
+            .bases
 
     assertNotNull(childRunnerDatasetList)
     assertEquals(parentDatasetList, childRunnerDatasetList)
@@ -651,7 +662,8 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
     val childRunnerDatasetList =
         runnerApiService
             .createRunner(organizationSaved.id, workspaceSaved.id, childRunnerWithEmptyDatasetList)
-            .datasetList
+            .datasets
+            .bases
 
     assertNotNull(childRunnerDatasetList)
     assertTrue(childRunnerDatasetList.isEmpty())
@@ -685,7 +697,8 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
         runnerApiService
             .createRunner(
                 organizationSaved.id, workspaceSaved.id, childRunnerWithNonEmptyDatasetList)
-            .datasetList
+            .datasets
+            .bases
 
     assertNotNull(childRunnerDatasetList)
     assertEquals(childDatasetList, childRunnerDatasetList)
@@ -820,7 +833,7 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
 
     val datasetRetrieved =
         datasetApiService.getDataset(
-            organizationSaved.id, workspaceSaved.id, runnerSaved.datasetList[0])
+            organizationSaved.id, workspaceSaved.id, runnerSaved.datasets.bases[0])
     runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
 
     assertDoesNotThrow {
@@ -829,7 +842,7 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
   }
 
   @Test
-  fun `users added to runner RBAC should have the corresponding role set in dataset`() {
+  fun `users added to runner RBAC should not have the corresponding role set in bases datasets`() {
     workspace =
         WorkspaceCreateRequest(
             key = "key",
@@ -851,12 +864,14 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
 
     val retrievedDataset =
         datasetApiService.getDataset(
-            organizationSaved.id, workspaceSaved.id, runnerSaved.datasetList[0])
+            organizationSaved.id, workspaceSaved.id, runnerSaved.datasets.bases[0])
 
-    val datasetAC =
-        datasetApiService.getDatasetAccessControl(
-            organizationSaved.id, workspaceSaved.id, retrievedDataset.id, "id")
-    assertEquals(ROLE_EDITOR, datasetAC.role)
+    val exception =
+        assertThrows<CsmResourceNotFoundException> {
+          datasetApiService.getDatasetAccessControl(
+              organizationSaved.id, workspaceSaved.id, retrievedDataset.id, "id")
+        }
+    assertEquals("User id not found in ${retrievedDataset.id} component", exception.message)
   }
 
   @Test