Skip to content

Commit 681ea40

Browse files
jreynard-codejreynard-code
committed
Remove state, lastRun, parentLastRun, rootLastRun on Runner + add lastRunId instead
1 parent 7932237 commit 681ea40

File tree

12 files changed

+52
-164
lines changed

12 files changed

+52
-164
lines changed

‎doc/.openapi-generator/FILES‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,11 @@ Models/RunnerChangedParameterValue.md
6767
Models/RunnerComparisonResult.md
6868
Models/RunnerDataDownloadInfo.md
6969
Models/RunnerDataDownloadJob.md
70-
Models/RunnerJobState.md
71-
Models/RunnerLastRun.md
7270
Models/RunnerResourceSizing.md
7371
Models/RunnerRole.md
7472
Models/RunnerRunTemplateParameterValue.md
7573
Models/RunnerSecurity.md
7674
Models/RunnerValidationStatus.md
77-
Models/Runner_lastRun.md
78-
Models/Runner_parentLastRun.md
79-
Models/Runner_rootLastRun.md
8075
Models/Scenario.md
8176
Models/ScenarioAccessControl.md
8277
Models/ScenarioChangedParameterValue.md

‎doc/Apis/RunnerApi.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ Set the Runner default security
326326

327327
<a name="startRun"></a>
328328
# **startRun**
329-
> RunnerLastRun startRun(organization\_id, workspace\_id, runner\_id)
329+
> String startRun(organization\_id, workspace\_id, runner\_id)
330330
331331
Start a run with runner parameters
332332

@@ -340,7 +340,7 @@ Start a run with runner parameters
340340

341341
### Return type
342342

343-
[**RunnerLastRun**](../Models/RunnerLastRun.md)
343+
**String**
344344

345345
### Authorization
346346

‎doc/Models/Runner.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
| **runTemplateId** | **String** | the Solution Run Template Id associated with this Runner | [optional] [default to null] |
1515
| **organizationId** | **String** | the associated Organization Id | [optional] [default to null] |
1616
| **workspaceId** | **String** | the associated Workspace Id | [optional] [default to null] |
17-
| **state** | [**RunnerJobState**](RunnerJobState.md) | | [optional] [default to null] |
1817
| **creationDate** | **Long** | the Runner creation date | [optional] [default to null] |
1918
| **lastUpdate** | **Long** | the last time a Runner was updated | [optional] [default to null] |
2019
| **ownerName** | **String** | the name of the owner | [optional] [default to null] |
@@ -23,9 +22,7 @@
2322
| **datasetList** | **List** | the list of Dataset Id associated to this Runner Run Template | [optional] [default to null] |
2423
| **runSizing** | [**RunnerResourceSizing**](RunnerResourceSizing.md) | | [optional] [default to null] |
2524
| **parametersValues** | [**List**](RunnerRunTemplateParameterValue.md) | the list of Solution Run Template parameters values | [optional] [default to null] |
26-
| **lastRun** | [**Runner_lastRun**](Runner_lastRun.md) | | [optional] [default to null] |
27-
| **parentLastRun** | [**Runner_parentLastRun**](Runner_parentLastRun.md) | | [optional] [default to null] |
28-
| **rootLastRun** | [**Runner_rootLastRun**](Runner_rootLastRun.md) | | [optional] [default to null] |
25+
| **lastRunId** | **String** | last run id from current runner | [optional] [default to null] |
2926
| **validationStatus** | [**RunnerValidationStatus**](RunnerValidationStatus.md) | | [optional] [default to null] |
3027
| **security** | [**RunnerSecurity**](RunnerSecurity.md) | | [optional] [default to null] |
3128

‎doc/Models/RunnerDataDownloadInfo.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
| Name | Type | Description | Notes |
55
|------------ | ------------- | ------------- | -------------|
66
| **url** | **String** | the Runner Data Download URL | [optional] [default to null] |
7-
| **state** | [**RunnerJobState**](RunnerJobState.md) | | [optional] [default to null] |
87

98
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
109

‎doc/README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,16 +239,11 @@ All URIs are relative to *https://dev.api.cosmotech.com*
239239
- [RunnerComparisonResult](./Models/RunnerComparisonResult.md)
240240
- [RunnerDataDownloadInfo](./Models/RunnerDataDownloadInfo.md)
241241
- [RunnerDataDownloadJob](./Models/RunnerDataDownloadJob.md)
242-
- [RunnerJobState](./Models/RunnerJobState.md)
243-
- [RunnerLastRun](./Models/RunnerLastRun.md)
244242
- [RunnerResourceSizing](./Models/RunnerResourceSizing.md)
245243
- [RunnerRole](./Models/RunnerRole.md)
246244
- [RunnerRunTemplateParameterValue](./Models/RunnerRunTemplateParameterValue.md)
247245
- [RunnerSecurity](./Models/RunnerSecurity.md)
248246
- [RunnerValidationStatus](./Models/RunnerValidationStatus.md)
249-
- [Runner_lastRun](./Models/Runner_lastRun.md)
250-
- [Runner_parentLastRun](./Models/Runner_parentLastRun.md)
251-
- [Runner_rootLastRun](./Models/Runner_rootLastRun.md)
252247
- [Scenario](./Models/Scenario.md)
253248
- [ScenarioAccessControl](./Models/ScenarioAccessControl.md)
254249
- [ScenarioChangedParameterValue](./Models/ScenarioChangedParameterValue.md)

‎openapi/plantuml/schemas.plantuml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,6 @@ entity Runner {
418418
runTemplateId: String
419419
organizationId: String
420420
workspaceId: String
421-
state: RunnerJobState
422421
creationDate: Long
423422
lastUpdate: Long
424423
ownerName: String
@@ -427,9 +426,7 @@ entity Runner {
427426
datasetList: List<String>
428427
runSizing: RunnerResourceSizing
429428
parametersValues: List<RunnerRunTemplateParameterValue>
430-
lastRun: RunnerLastRun
431-
parentLastRun: RunnerParentLastRun
432-
rootLastRun: RunnerRootLastRun
429+
lastRunId: String
433430
validationStatus: RunnerValidationStatus
434431
security: RunnerSecurity
435432
}
@@ -454,22 +451,12 @@ entity RunnerComparisonResult {
454451

455452
entity RunnerDataDownloadInfo {
456453
url: String
457-
state: RunnerJobState
458454
}
459455

460456
entity RunnerDataDownloadJob {
461457
id: String
462458
}
463459

464-
entity RunnerJobState {
465-
}
466-
467-
entity RunnerLastRun {
468-
}
469-
470-
entity RunnerParentLastRun {
471-
}
472-
473460
entity RunnerResourceSizing {
474461
* requests: ResourceSizeInfo
475462
* limits: ResourceSizeInfo
@@ -479,9 +466,6 @@ entity RunnerRole {
479466
* role: String
480467
}
481468

482-
entity RunnerRootLastRun {
483-
}
484-
485469
entity RunnerRunTemplateParameterValue {
486470
* parameterId: String
487471
varType: String
@@ -842,9 +826,6 @@ entity WorkspaceWebApp {
842826
options: Map
843827
}
844828

845-
RunnerLastRun <|--- RunnerLastRun
846-
RunnerLastRun <|--- RunnerParentLastRun
847-
RunnerLastRun <|--- RunnerRootLastRun
848829

849830
ContainerResourceSizing -- ContainerResourceSizeInfo : requests
850831
ContainerResourceSizing -- ContainerResourceSizeInfo : limits
@@ -898,9 +879,6 @@ ScenarioRunStatusNode -- ScenarioRunResourceRequested : resourcesDuration
898879
Connector -- "0..*" ConnectorParameterGroup : parameterGroups
899880
Runner -- RunnerResourceSizing : runSizing
900881
Runner -- "0..*" RunnerRunTemplateParameterValue : parametersValues
901-
Runner -- RunnerLastRun : lastRun
902-
Runner -- RunnerParentLastRun : parentLastRun
903-
Runner -- RunnerRootLastRun : rootLastRun
904882
Runner -- RunnerSecurity : security
905883
RunStatus -- "0..*" RunStatusNode : nodes
906884
RunnerSecurity -- "0..*" RunnerAccessControl : accessControlList

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,7 @@ class RunServiceImpl(
514514
@EventListener(RunStop::class)
515515
fun onRunStop(runStopRequest: RunStop) {
516516
val runner = runStopRequest.runnerData as Runner
517-
val run =
518-
getRun(
519-
runner.organizationId!!,
520-
runner.workspaceId!!,
521-
runner.id!!,
522-
runner.lastRun!!.runnerRunId!!)
517+
val run = getRun(runner.organizationId!!, runner.workspaceId!!, runner.id!!, runner.lastRunId!!)
523518
run.hasPermission(PERMISSION_WRITE)
524519
if (run.state!!.isTerminal()) {
525520
throw IllegalStateException(

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package com.cosmotech.runner.service
66

77
import com.cosmotech.api.config.CsmPlatformProperties
8+
import com.cosmotech.api.events.AskRunStatusEvent
89
import com.cosmotech.api.events.CsmEventPublisher
910
import com.cosmotech.api.events.RunStart
1011
import com.cosmotech.api.exceptions.CsmAccessForbiddenException
@@ -36,8 +37,6 @@ import com.cosmotech.organization.domain.OrganizationSecurity
3637
import com.cosmotech.runner.RunnerApiServiceInterface
3738
import com.cosmotech.runner.domain.Runner
3839
import com.cosmotech.runner.domain.RunnerAccessControl
39-
import com.cosmotech.runner.domain.RunnerJobState
40-
import com.cosmotech.runner.domain.RunnerLastRun
4140
import com.cosmotech.runner.domain.RunnerRole
4241
import com.cosmotech.runner.domain.RunnerSecurity
4342
import com.cosmotech.runner.domain.RunnerValidationStatus
@@ -433,10 +432,15 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() {
433432

434433
@Test
435434
fun `test deleting a running runner`() {
436-
runnerSaved.state = RunnerJobState.Running
435+
runnerSaved.lastRunId = "run-genid12345"
437436
runnerApiService.updateRunner(
438437
organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runnerSaved)
439438

439+
every { eventPublisher.publishEvent(any<AskRunStatusEvent>()) } answers
440+
{
441+
firstArg<AskRunStatusEvent>().response = "Running"
442+
}
443+
440444
val exception =
441445
assertThrows<Exception> {
442446
runnerApiService.deleteRunner(
@@ -578,22 +582,21 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() {
578582

579583
@Test
580584
fun `startRun send event and save lastRun info`() {
581-
val mockRunId = "run-genid12345"
582-
val expectedRunInfo = RunnerLastRun(runnerRunId = mockRunId)
585+
val expectedRunId = "run-genid12345"
583586
every { eventPublisher.publishEvent(any<RunStart>()) } answers
584587
{
585-
firstArg<RunStart>().response = mockRunId
588+
firstArg<RunStart>().response = expectedRunId
586589
}
587590

588-
val runInfo =
591+
val runId =
589592
runnerApiService.startRun(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!)
590-
assertEquals(expectedRunInfo, runInfo)
593+
assertEquals(expectedRunId, runId)
591594

592-
val lastRunInfo =
595+
val lastRunId =
593596
runnerApiService
594597
.getRunner(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!)
595-
.lastRun
596-
assertEquals(expectedRunInfo, lastRunInfo)
598+
.lastRunId
599+
assertEquals(expectedRunId, lastRunId)
597600
}
598601

599602
private fun makeWorkspaceEventHubInfo(eventHubAvailable: Boolean): WorkspaceEventHubInfo {

‎runner/src/main/kotlin/com/cosmotech/runner/service/RunnerApiServiceImpl.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import com.cosmotech.api.utils.constructPageRequest
1414
import com.cosmotech.runner.RunnerApiServiceInterface
1515
import com.cosmotech.runner.domain.Runner
1616
import com.cosmotech.runner.domain.RunnerAccessControl
17-
import com.cosmotech.runner.domain.RunnerLastRun
1817
import com.cosmotech.runner.domain.RunnerRole
1918
import com.cosmotech.runner.domain.RunnerSecurity
2019
import org.springframework.data.domain.PageRequest
@@ -81,11 +80,7 @@ internal class RunnerApiServiceImpl(
8180
return runnerService.listInstances(pageRequest)
8281
}
8382

84-
override fun startRun(
85-
organizationId: String,
86-
workspaceId: String,
87-
runnerId: String
88-
): RunnerLastRun {
83+
override fun startRun(organizationId: String, workspaceId: String, runnerId: String): String {
8984
val runnerService = getRunnerService().inOrganization(organizationId).inWorkspace(workspaceId)
9085

9186
val runnerInstance = runnerService.getInstance(runnerId).userHasPermission(PERMISSION_LAUNCH)

‎runner/src/main/kotlin/com/cosmotech/runner/service/RunnerEventServiceImpl.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class RunnerEventServiceImpl(private val runnerApiService: RunnerApiService) :
1515
val workspaceId = triggerEvent.workspaceId
1616
val runnerId = triggerEvent.runnerId
1717

18-
val runInfo = runnerApiService.startRun(organizationId, workspaceId, runnerId)
19-
triggerEvent.response = runInfo.runnerRunId
18+
val runId = runnerApiService.startRun(organizationId, workspaceId, runnerId)
19+
triggerEvent.response = runId
2020
}
2121
}

0 commit comments

Comments
 (0)