Skip to content

Add integration tests and logic to include datasets.parameters in createRunner and updateRunner responses #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jreynard-code merged 1 commit into from
Nov 13, 2025
Merged

Add integration tests and logic to include datasets.parameters in createRunner and updateRunner responses #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/src/integrationTest/kotlin/com/cosmotech/api/home/runner/RunnerControllerTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@ class RunnerControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$.runTemplateName").value(runTemplateName))
.andExpect(jsonPath("$.tags").value(tags))
.andExpect(jsonPath("$.datasets.bases").value(datasetList))
.andExpect(jsonPath("$.datasets.parameters[0].name").value(solutionParameterId2))
.andExpect(jsonPath("$.datasets.parameters[0].sourceName").value(TEST_FILE_NAME))
.andExpect(jsonPath("$.datasets.parameters[0].type").value(DatasetPartTypeEnum.File.name))
.andExpect(jsonPath("$.security.default").value(ROLE_NONE))
.andExpect(jsonPath("$.runSizing.requests.cpu").value("cpu_requests"))
.andExpect(jsonPath("$.runSizing.requests.memory").value("memory_requests"))
Expand Down Expand Up @@ -423,6 +426,9 @@ class RunnerControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$.runTemplateName").value(runTemplateName))
.andExpect(jsonPath("$.tags").value(tags))
.andExpect(jsonPath("$.datasets.bases").value(datasetList))
.andExpect(jsonPath("$.datasets.parameters[0].name").value(solutionParameterId2))
.andExpect(jsonPath("$.datasets.parameters[0].sourceName").value(TEST_FILE_NAME))
.andExpect(jsonPath("$.datasets.parameters[0].type").value(DatasetPartTypeEnum.File.name))
.andExpect(jsonPath("$.security.default").value(ROLE_NONE))
.andExpect(jsonPath("$.runSizing.requests.cpu").value("cpu_requests"))
.andExpect(jsonPath("$.runSizing.requests.memory").value("memory_requests"))
Expand Down
2 changes: 2 additions & 0 deletions run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.cosmotech.common.utils.getCurrentAuthenticatedUserName
import com.cosmotech.dataset.DatasetApiServiceInterface
import com.cosmotech.dataset.domain.Dataset
import com.cosmotech.dataset.domain.DatasetCreateRequest
import com.cosmotech.dataset.domain.DatasetPart
import com.cosmotech.organization.OrganizationApiServiceInterface
import com.cosmotech.organization.domain.Organization
import com.cosmotech.organization.domain.OrganizationAccessControl
Expand Down Expand Up @@ -125,6 +126,7 @@ class RunServiceIntegrationTest : CsmTestBase() {
rediSearchIndexer.createIndexFor(Solution::class.java)
rediSearchIndexer.createIndexFor(Workspace::class.java)
rediSearchIndexer.createIndexFor(Dataset::class.java)
rediSearchIndexer.createIndexFor(DatasetPart::class.java)
rediSearchIndexer.createIndexFor(Runner::class.java)
rediSearchIndexer.createIndexFor(Run::class.java)

Expand Down
105 changes: 105 additions & 0 deletions ...r/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,111 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
assertEquals("param2", runnerDatasetParameters[0].name)
}

@Test
fun `test datasets_parameters is listed into createRunner response`() {
val workspaceDatasetCreateRequest =
makeDataset(
name = "WorkspaceDataset",
parts =
mutableListOf(
DatasetPartCreateRequest(name = "defaultPart", sourceName = "test.txt")))
val workspaceDataset =
datasetApiService.createDataset(
organizationSaved.id,
workspaceSaved.id,
workspaceDatasetCreateRequest,
arrayOf(
MockMultipartFile(
"files",
"test.txt",
MediaType.MULTIPART_FORM_DATA_VALUE,
"test".toByteArray())))
workspaceSaved =
workspaceApiService.updateWorkspace(
organizationSaved.id,
workspaceSaved.id,
WorkspaceUpdateRequest(
solution =
WorkspaceSolution(
solutionId = solutionSaved.id,
datasetId = workspaceDataset.id,
defaultParameterValues =
mutableMapOf("param2" to workspaceDataset.parts[0].id))))
val runnerWithInheritedDatasetParameterCreateRequest =
makeRunnerCreateRequest(
name = "Runner_with_inherited_dataset_parameter",
datasetList = mutableListOf(datasetSaved.id))
val runnerWithInheritedDatasetParameter =
runnerApiService.createRunner(
organizationSaved.id,
workspaceSaved.id,
runnerWithInheritedDatasetParameterCreateRequest)

assertNotNull(runnerWithInheritedDatasetParameter)
val runnerDatasetParameters =
runnerWithInheritedDatasetParameter.datasets.parameters as MutableList<DatasetPart>
assertNotNull(runnerDatasetParameters)
assertEquals(1, runnerDatasetParameters.size)
assertEquals("test.txt", runnerDatasetParameters[0].sourceName)
assertEquals("param2", runnerDatasetParameters[0].name)
}

@Test
fun `test datasets_parameters is listed into updateRunner response`() {
val workspaceDatasetCreateRequest =
makeDataset(
name = "WorkspaceDataset",
parts =
mutableListOf(
DatasetPartCreateRequest(name = "defaultPart", sourceName = "test.txt")))
val workspaceDataset =
datasetApiService.createDataset(
organizationSaved.id,
workspaceSaved.id,
workspaceDatasetCreateRequest,
arrayOf(
MockMultipartFile(
"files",
"test.txt",
MediaType.MULTIPART_FORM_DATA_VALUE,
"test".toByteArray())))
workspaceSaved =
workspaceApiService.updateWorkspace(
organizationSaved.id,
workspaceSaved.id,
WorkspaceUpdateRequest(
solution =
WorkspaceSolution(
solutionId = solutionSaved.id,
datasetId = workspaceDataset.id,
defaultParameterValues =
mutableMapOf("param2" to workspaceDataset.parts[0].id))))
val runnerWithInheritedDatasetParameterCreateRequest =
makeRunnerCreateRequest(
name = "Runner_with_inherited_dataset_parameter",
datasetList = mutableListOf(datasetSaved.id))
val runnerWithInheritedDatasetParameter =
runnerApiService.createRunner(
organizationSaved.id,
workspaceSaved.id,
runnerWithInheritedDatasetParameterCreateRequest)

val runnerUpdatedWithInheritedDatasetParameter =
runnerApiService.updateRunner(
organizationSaved.id,
workspaceSaved.id,
runnerWithInheritedDatasetParameter.id,
RunnerUpdateRequest(name = "New Dataset name"))

assertNotNull(runnerUpdatedWithInheritedDatasetParameter)
val runnerDatasetParameters =
runnerUpdatedWithInheritedDatasetParameter.datasets.parameters as MutableList<DatasetPart>
assertNotNull(runnerDatasetParameters)
assertEquals(1, runnerDatasetParameters.size)
assertEquals("test.txt", runnerDatasetParameters[0].sourceName)
assertEquals("param2", runnerDatasetParameters[0].name)
}

@Test
fun `test find All Runners with different pagination params`() {
val numberOfRunners = 20
Expand Down
16 changes: 14 additions & 2 deletions runner/src/main/kotlin/com/cosmotech/runner/service/RunnerApiServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ internal class RunnerApiServiceImpl(
.initBaseDatasetListFromParent(parentId, runnerCreateRequest.datasetList)
}

return runnerService.saveInstance(runnerInstance)
val runnerSaved = runnerService.saveInstance(runnerInstance)
val listDatasetParts =
datasetApiServiceInterface.listDatasetParts(
organizationId, workspaceId, runnerSaved.datasets.parameter, null, null)

return runnerSaved.apply { datasets.parameters = listDatasetParts as MutableList<Any>? }
}

override fun getRunner(organizationId: String, workspaceId: String, runnerId: String): Runner {
Expand All @@ -82,7 +87,14 @@ internal class RunnerApiServiceImpl(
val runnerService = getRunnerService().inOrganization(organizationId).inWorkspace(workspaceId)
val runnerInstance = runnerService.getInstance(runnerId).userHasPermission(PERMISSION_WRITE)

return runnerService.saveInstance(runnerInstance.setValueFrom(runnerUpdateRequest).stamp())
val runnerSaved =
runnerService.saveInstance(runnerInstance.setValueFrom(runnerUpdateRequest).stamp())

val listDatasetParts =
datasetApiServiceInterface.listDatasetParts(
organizationId, workspaceId, runnerSaved.datasets.parameter, null, null)

return runnerSaved.apply { datasets.parameters = listDatasetParts as MutableList<Any>? }
}

override fun deleteRunner(organizationId: String, workspaceId: String, runnerId: String) {
Expand Down