Skip to content

Commit fe242aa

Browse files
committed
Remove twingraph, scenario and scenariorun apis
1 parent 1d59708 commit fe242aa

File tree

14 files changed

+15
-441
lines changed

14 files changed

+15
-441
lines changed

src/main/kotlin/com/cosmotech/api/clients/EventBusClient.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/kotlin/com/cosmotech/api/clients/ResultDataClient.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/kotlin/com/cosmotech/api/clients/impl/DummyEventBusClient.kt

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/kotlin/com/cosmotech/api/clients/impl/DummyResultDataClient.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/kotlin/com/cosmotech/api/config/CsmPlatformProperties.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ data class CsmPlatformProperties(
175175

176176
/** Container image to send data to DataWarehouse */
177177
val sendDataWarehouse: String,
178-
val scenarioDataUpload: String = "cosmo-tech/azure-storage-publish:latest",
179178
)
180179

181180
data class CsmContainers(
@@ -502,17 +501,17 @@ data class CsmPlatformProperties(
502501
/** Twin cache query page information for workspace */
503502
val workspace: PageSizing = PageSizing(),
504503

505-
/** Twin cache query page information for scenario */
506-
val scenario: PageSizing = PageSizing(),
504+
/** Twin cache query page information for runner */
505+
val runner: PageSizing = PageSizing(),
507506

508507
/** Twin cache query page information for connector */
509508
val connector: PageSizing = PageSizing(),
510509

511510
/** Twin cache query page information for dataset */
512511
val dataset: PageSizing = PageSizing(),
513512

514-
/** Twin cache query page information for scenariorun */
515-
val scenariorun: PageSizing = PageSizing(),
513+
/** Twin cache query page information for run */
514+
val run: PageSizing = PageSizing(),
516515

517516
/** Twin cache query page information for solution */
518517
val solution: PageSizing = PageSizing(),

src/main/kotlin/com/cosmotech/api/events/CsmRequestResponseEvents.kt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the MIT license.
33
package com.cosmotech.api.events
44

5-
import java.time.ZonedDateTime
6-
75
sealed class CsmRequestResponseEvent<T>(publisher: Any) : CsmEvent(publisher) {
86
var response: T? = null
97
}
@@ -14,20 +12,6 @@ class WorkflowStatusRequest(
1412
val workflowName: String,
1513
) : CsmRequestResponseEvent<String>(publisher)
1614

17-
class ScenarioDataDownloadRequest(
18-
publisher: Any,
19-
val jobId: String,
20-
val organizationId: String,
21-
val workspaceId: String,
22-
val scenarioId: String
23-
) : CsmRequestResponseEvent<Map<String, Any>>(publisher)
24-
25-
class ScenarioDataDownloadJobInfoRequest(
26-
publisher: Any,
27-
val jobId: String,
28-
val organizationId: String,
29-
) : CsmRequestResponseEvent<Pair<String?, String>>(publisher)
30-
3115
class WorkflowPhaseToStateRequest(
3216
publisher: Any,
3317
val organizationId: String,
@@ -36,20 +20,6 @@ class WorkflowPhaseToStateRequest(
3620
val workflowPhase: String?,
3721
) : CsmRequestResponseEvent<String>(publisher)
3822

39-
class ScenarioRunEndToEndStateRequest(
40-
publisher: Any,
41-
val organizationId: String,
42-
val workspaceId: String,
43-
val scenarioRunId: String
44-
) : CsmRequestResponseEvent<String>(publisher)
45-
46-
class ScenarioRunEndTimeRequest(
47-
publisher: Any,
48-
val organizationId: String,
49-
val workspaceId: String,
50-
val scenarioRunId: String
51-
) : CsmRequestResponseEvent<ZonedDateTime>(publisher)
52-
5323
class AddDatasetToWorkspace(
5424
publisher: Any,
5525
val organizationId: String,

src/main/kotlin/com/cosmotech/api/events/ScenarioEvents.kt

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/main/kotlin/com/cosmotech/api/events/ScenarioRunEvents.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/kotlin/com/cosmotech/api/rbac/RolesDefinition.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ val COMMON_ROLE_ADMIN_PERMISSIONS =
3838
)
3939

4040
// Scenario roles & permissions
41-
val SCENARIO_ROLE_VIEWER_PERMISSIONS = listOf(PERMISSION_READ, PERMISSION_READ_SECURITY)
42-
val SCENARIO_ROLE_EDITOR_PERMISSIONS =
41+
val RUNNER_ROLE_VIEWER_PERMISSIONS = listOf(PERMISSION_READ, PERMISSION_READ_SECURITY)
42+
val RUNNER_ROLE_EDITOR_PERMISSIONS =
4343
listOf(PERMISSION_READ, PERMISSION_READ_SECURITY, PERMISSION_LAUNCH, PERMISSION_WRITE)
44-
val SCENARIO_ROLE_VALIDATOR_PERMISSIONS =
44+
val RUNNER_ROLE_VALIDATOR_PERMISSIONS =
4545
listOf(
4646
PERMISSION_READ,
4747
PERMISSION_READ_SECURITY,
4848
PERMISSION_LAUNCH,
4949
PERMISSION_WRITE,
5050
PERMISSION_VALIDATE)
51-
val SCENARIO_ROLE_ADMIN_PERMISSIONS =
51+
val RUNNER_ROLE_ADMIN_PERMISSIONS =
5252
listOf(
5353
PERMISSION_READ,
5454
PERMISSION_READ_SECURITY,
@@ -77,8 +77,8 @@ fun getAllRolesDefinition(): Map<String, MutableMap<String, MutableList<String>>
7777
.permissions
7878
.mapValues { it.value.toMutableList() }
7979
.toMutableMap(),
80-
"scenario" to
81-
getScenarioRolesDefinition()
80+
"runner" to
81+
getRunnerRolesDefinition()
8282
.permissions
8383
.mapValues { it.value.toMutableList() }
8484
.toMutableMap())
@@ -100,14 +100,14 @@ fun getCommonRolesDefinition(): RolesDefinition {
100100
adminRole = ROLE_ADMIN)
101101
}
102102

103-
fun getScenarioRolesDefinition(): RolesDefinition {
103+
fun getRunnerRolesDefinition(): RolesDefinition {
104104
return RolesDefinition(
105105
permissions =
106106
mutableMapOf(
107-
ROLE_VIEWER to SCENARIO_ROLE_VIEWER_PERMISSIONS,
108-
ROLE_EDITOR to SCENARIO_ROLE_EDITOR_PERMISSIONS,
109-
ROLE_VALIDATOR to SCENARIO_ROLE_VALIDATOR_PERMISSIONS,
110-
ROLE_ADMIN to SCENARIO_ROLE_ADMIN_PERMISSIONS,
107+
ROLE_VIEWER to RUNNER_ROLE_VIEWER_PERMISSIONS,
108+
ROLE_EDITOR to RUNNER_ROLE_EDITOR_PERMISSIONS,
109+
ROLE_VALIDATOR to RUNNER_ROLE_VALIDATOR_PERMISSIONS,
110+
ROLE_ADMIN to RUNNER_ROLE_ADMIN_PERMISSIONS,
111111
),
112112
adminRole = ROLE_ADMIN)
113113
}

src/main/kotlin/com/cosmotech/api/scenario/MetaData.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)