Skip to content

Commit 81a033a

Browse files
jreynard-codejreynard-code
committed
Remove property csmSimulator from Solution, SolutionCreateRequest and SolutionUpdateRequest
1 parent 0ee4268 commit 81a033a

File tree

19 files changed

+9
-85
lines changed

19 files changed

+9
-85
lines changed

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.cosmotech.api.home.runner.RunnerConstants.RUNNER_OWNER_NAME
88
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_KEY
99
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_NAME
1010
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_REPOSITORY
11-
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_SIMULATOR
1211
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_VERSION
1312
import com.cosmotech.api.home.workspace.WorkspaceConstants.WORKSPACE_KEY
1413
import com.cosmotech.api.home.workspace.WorkspaceConstants.WORKSPACE_NAME
@@ -78,7 +77,6 @@ class ControllerTestUtils {
7877
name: String = SOLUTION_NAME,
7978
repository: String = SOLUTION_REPOSITORY,
8079
version: String = SOLUTION_VERSION,
81-
csmSimulator: String = SOLUTION_SIMULATOR,
8280
description: String = "",
8381
alwaysPull: Boolean? = null,
8482
tags: MutableList<String> = mutableListOf(),
@@ -93,7 +91,6 @@ class ControllerTestUtils {
9391
name = name,
9492
repository = repository,
9593
version = version,
96-
csmSimulator = csmSimulator,
9794
description = description,
9895
alwaysPull = alwaysPull,
9996
tags = tags,
@@ -111,7 +108,6 @@ class ControllerTestUtils {
111108
name: String = SOLUTION_NAME,
112109
repository: String = SOLUTION_REPOSITORY,
113110
version: String = SOLUTION_VERSION,
114-
csmSimulator: String = SOLUTION_SIMULATOR,
115111
description: String = "",
116112
alwaysPull: Boolean? = null,
117113
tags: MutableList<String> = mutableListOf(),
@@ -122,7 +118,6 @@ class ControllerTestUtils {
122118
name = name,
123119
repository = repository,
124120
version = version,
125-
csmSimulator = csmSimulator,
126121
description = description,
127122
alwaysPull = alwaysPull,
128123
tags = tags,

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/solution/SolutionConstants.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ object SolutionConstants {
1414
const val SOLUTION_REPOSITORY = "solution_repository"
1515
const val SOLUTION_VERSION = "1.0.0"
1616
const val SOLUTION_SDK_VERSION = "11.3.0-45678.abcdef12"
17-
const val SOLUTION_SIMULATOR = "my_simulator_name"
1817
const val NEW_USER_ID = "[email protected]"
1918
const val NEW_USER_ROLE = "editor"
2019
const val NEW_SOLUTION_NAME = "my_new_solution_name"
2120

22-
object RequestContent {
23-
const val MINIMAL_SOLUTION_REQUEST_CREATION =
24-
"""{"key":"$SOLUTION_KEY","name":"$SOLUTION_NAME","repository":"$SOLUTION_REPOSITORY","version":"$SOLUTION_VERSION","csmSimulator":"$SOLUTION_SIMULATOR"}"""
25-
}
21+
object RequestContent {}
2622

2723
object Errors {}
2824
}

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/solution/SolutionControllerTests.kt‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_KEY
1717
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_NAME
1818
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_REPOSITORY
1919
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_SDK_VERSION
20-
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_SIMULATOR
2120
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_VERSION
2221
import com.cosmotech.api.rbac.ROLE_ADMIN
2322
import com.cosmotech.api.rbac.ROLE_NONE
@@ -186,7 +185,6 @@ class SolutionControllerTests : ControllerTestBase() {
186185
SOLUTION_NAME,
187186
SOLUTION_REPOSITORY,
188187
SOLUTION_VERSION,
189-
SOLUTION_SIMULATOR,
190188
description,
191189
false,
192190
tags,
@@ -324,7 +322,6 @@ class SolutionControllerTests : ControllerTestBase() {
324322
SOLUTION_NAME,
325323
SOLUTION_REPOSITORY,
326324
SOLUTION_VERSION,
327-
SOLUTION_SIMULATOR,
328325
description,
329326
false,
330327
tags,
@@ -422,15 +419,14 @@ class SolutionControllerTests : ControllerTestBase() {
422419

423420
val solutionUpdateRequest =
424421
constructSolutionUpdateRequest(
425-
SOLUTION_KEY,
426-
SOLUTION_NAME,
427-
SOLUTION_REPOSITORY,
428-
SOLUTION_VERSION,
429-
SOLUTION_SIMULATOR,
430-
description,
431-
true,
432-
tags,
433-
url)
422+
key = SOLUTION_KEY,
423+
name = SOLUTION_NAME,
424+
repository = SOLUTION_REPOSITORY,
425+
version = SOLUTION_VERSION,
426+
description = description,
427+
alwaysPull = true,
428+
tags = tags,
429+
url = url)
434430

435431
mvc.perform(
436432
patch("/organizations/$organizationId/solutions/$solutionId")

‎dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,6 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
11491149
key = UUID.randomUUID().toString(),
11501150
name = "My solution",
11511151
runTemplates = mutableListOf(RunTemplateCreateRequest("template")),
1152-
csmSimulator = "simulator",
11531152
repository = "repository",
11541153
parameterGroups = mutableListOf(RunTemplateParameterGroupCreateRequest("group")),
11551154
parameters = mutableListOf(RunTemplateParameterCreateRequest("parameter", "string")),

‎doc/Models/Solution.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| **description** | **String** | The Solution description | [optional] [default to null] |
1111
| **repository** | **String** | The registry repository containing the image | [default to null] |
1212
| **alwaysPull** | **Boolean** | Set to true if the runtemplate wants to always pull the image | [optional] [default to false] |
13-
| **csmSimulator** | **String** | The main Cosmo Tech simulator name used in standard Run Template | [default to null] |
1413
| **version** | **String** | The Solution version MAJOR.MINOR.PATCH. Must be aligned with an existing repository tag | [default to null] |
1514
| **ownerId** | **String** | The User id which owns this Solution | [default to null] |
1615
| **sdkVersion** | **String** | The full SDK version used to build this solution, if available | [optional] [default to null] |

‎doc/Models/SolutionCreateRequest.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
| **repository** | **String** | The registry repository containing the image | [default to null] |
1010
| **version** | **String** | The Solution version MAJOR.MINOR.PATCH | [default to null] |
1111
| **alwaysPull** | **Boolean** | Set to true if the runtemplate wants to always pull the image | [optional] [default to false] |
12-
| **csmSimulator** | **String** | The main Cosmo Tech simulator name used in standard Run Template | [default to null] |
1312
| **tags** | **List** | The list of tags | [optional] [default to null] |
1413
| **parameters** | [**List**](RunTemplateParameterCreateRequest.md) | The list of Run Template Parameters | [optional] [default to []] |
1514
| **parameterGroups** | [**List**](RunTemplateParameterGroupCreateRequest.md) | The list of parameters groups for the Run Templates | [optional] [default to []] |

‎doc/Models/SolutionUpdateRequest.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
| **description** | **String** | The Solution description | [optional] [default to null] |
99
| **repository** | **String** | The registry repository containing the image | [optional] [default to null] |
1010
| **alwaysPull** | **Boolean** | Set to true if the runtemplate wants to always pull the image | [optional] [default to false] |
11-
| **csmSimulator** | **String** | The main Cosmo Tech simulator name used in standard Run Template | [optional] [default to null] |
1211
| **version** | **String** | The Solution version MAJOR.MINOR.PATCH. Must be aligned with an existing repository tag | [optional] [default to null] |
1312
| **url** | **String** | An optional URL link to solution page | [optional] [default to null] |
1413
| **tags** | **List** | The list of tags | [optional] [default to null] |

‎openapi/plantuml/schemas.plantuml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@ entity Solution {
499499
description: String
500500
* repository: String
501501
alwaysPull: Boolean
502-
* csmSimulator: String
503502
* version: String
504503
* ownerId: String
505504
sdkVersion: String
@@ -523,7 +522,6 @@ entity SolutionCreateRequest {
523522
* repository: String
524523
* version: String
525524
alwaysPull: Boolean
526-
* csmSimulator: String
527525
tags: List<String>
528526
parameters: List<RunTemplateParameterCreateRequest>
529527
parameterGroups: List<RunTemplateParameterGroupCreateRequest>
@@ -547,7 +545,6 @@ entity SolutionUpdateRequest {
547545
description: String
548546
repository: String
549547
alwaysPull: Boolean
550-
csmSimulator: String
551548
version: String
552549
url: String
553550
tags: List<String>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ class RunServiceIntegrationTest : CsmRunTestBase() {
221221
name = "RunTemplate1",
222222
description = "RunTemplate1 description")),
223223
parameters = mutableListOf(RunTemplateParameterCreateRequest("parameter", "string")),
224-
csmSimulator = "simulator",
225224
version = "1.0.0",
226225
repository = "repository",
227226
parameterGroups = mutableListOf(RunTemplateParameterGroupCreateRequest("group")),

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ class ContainerFactoryTests {
262262
RunTemplateParameterGroup(
263263
id = "parameter", isTable = false, parameters = mutableListOf())),
264264
organizationId = "Organizationid",
265-
csmSimulator = "simulator",
266265
security = SolutionSecurity(ROLE_ADMIN, mutableListOf()),
267266
)
268267
}

0 commit comments

Comments
 (0)