Skip to content

Commit 59bacd3

Browse files
jreynard-codejreynard-code
committed
Remove security field from DatasetUpdateRequest across codebase
- Eliminated `security` property from OpenAPI schema, dataset service, and relevant documentation. - Adjusted `DatasetServiceImpl` to default to existing security settings. - Updated integration tests to reflect removal of `security` field in dataset creation and updates.
1 parent 8842d3f commit 59bacd3

File tree

6 files changed

+40
-73
lines changed

6 files changed

+40
-73
lines changed

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,15 +1031,7 @@ class DatasetControllerTests : ControllerTestBase() {
10311031
sourceName = TEST_FILE_NAME,
10321032
description = newPartDescription,
10331033
tags = newPartTags,
1034-
type = DatasetPartTypeEnum.File)),
1035-
security =
1036-
DatasetSecurity(
1037-
default = ROLE_NONE,
1038-
accessControlList =
1039-
mutableListOf(
1040-
DatasetAccessControl(id = PLATFORM_ADMIN_EMAIL, role = ROLE_ADMIN),
1041-
DatasetAccessControl(
1042-
id = ORGANIZATION_USER_EMAIL, role = ROLE_VIEWER))))
1034+
type = DatasetPartTypeEnum.File)))
10431035

10441036
val datasetUpdateRequestMultipartFile =
10451037
MockMultipartFile(
@@ -1095,7 +1087,7 @@ class DatasetControllerTests : ControllerTestBase() {
10951087
.andExpect(jsonPath("$.security.default").value(ROLE_NONE))
10961088
.andExpect(jsonPath("$.security.accessControlList[0].role").value(ROLE_ADMIN))
10971089
.andExpect(jsonPath("$.security.accessControlList[0].id").value(PLATFORM_ADMIN_EMAIL))
1098-
.andExpect(jsonPath("$.security.accessControlList[1].role").value(ROLE_VIEWER))
1090+
.andExpect(jsonPath("$.security.accessControlList[1].role").value(ROLE_EDITOR))
10991091
.andExpect(jsonPath("$.security.accessControlList[1].id").value(ORGANIZATION_USER_EMAIL))
11001092
.andDo(MockMvcResultHandlers.print())
11011093
.andDo(
@@ -1126,18 +1118,7 @@ class DatasetControllerTests : ControllerTestBase() {
11261118
val newTags = mutableListOf("tag1_updated", "tag2_updated")
11271119

11281120
val datasetUpdateRequest =
1129-
DatasetUpdateRequest(
1130-
name = newName,
1131-
description = newDescription,
1132-
tags = newTags,
1133-
security =
1134-
DatasetSecurity(
1135-
default = ROLE_NONE,
1136-
accessControlList =
1137-
mutableListOf(
1138-
DatasetAccessControl(id = PLATFORM_ADMIN_EMAIL, role = ROLE_ADMIN),
1139-
DatasetAccessControl(
1140-
id = ORGANIZATION_USER_EMAIL, role = ROLE_VIEWER))))
1121+
DatasetUpdateRequest(name = newName, description = newDescription, tags = newTags)
11411122

11421123
val datasetUpdateRequestMultipartFile =
11431124
MockMultipartFile(
@@ -1185,7 +1166,7 @@ class DatasetControllerTests : ControllerTestBase() {
11851166
.andExpect(jsonPath("$.security.default").value(ROLE_NONE))
11861167
.andExpect(jsonPath("$.security.accessControlList[0].role").value(ROLE_ADMIN))
11871168
.andExpect(jsonPath("$.security.accessControlList[0].id").value(PLATFORM_ADMIN_EMAIL))
1188-
.andExpect(jsonPath("$.security.accessControlList[1].role").value(ROLE_VIEWER))
1169+
.andExpect(jsonPath("$.security.accessControlList[1].role").value(ROLE_EDITOR))
11891170
.andExpect(jsonPath("$.security.accessControlList[1].id").value(ORGANIZATION_USER_EMAIL))
11901171
.andDo(MockMvcResultHandlers.print())
11911172
}
@@ -1214,18 +1195,7 @@ class DatasetControllerTests : ControllerTestBase() {
12141195

12151196
val datasetUpdateRequest =
12161197
DatasetUpdateRequest(
1217-
name = newName,
1218-
description = newDescription,
1219-
tags = newTags,
1220-
parts = mutableListOf(),
1221-
security =
1222-
DatasetSecurity(
1223-
default = ROLE_NONE,
1224-
accessControlList =
1225-
mutableListOf(
1226-
DatasetAccessControl(id = PLATFORM_ADMIN_EMAIL, role = ROLE_ADMIN),
1227-
DatasetAccessControl(
1228-
id = ORGANIZATION_USER_EMAIL, role = ROLE_VIEWER))))
1198+
name = newName, description = newDescription, tags = newTags, parts = mutableListOf())
12291199

12301200
val datasetUpdateRequestMultipartFile =
12311201
MockMultipartFile(
@@ -1261,7 +1231,7 @@ class DatasetControllerTests : ControllerTestBase() {
12611231
.andExpect(jsonPath("$.security.default").value(ROLE_NONE))
12621232
.andExpect(jsonPath("$.security.accessControlList[0].role").value(ROLE_ADMIN))
12631233
.andExpect(jsonPath("$.security.accessControlList[0].id").value(PLATFORM_ADMIN_EMAIL))
1264-
.andExpect(jsonPath("$.security.accessControlList[1].role").value(ROLE_VIEWER))
1234+
.andExpect(jsonPath("$.security.accessControlList[1].role").value(ROLE_EDITOR))
12651235
.andExpect(jsonPath("$.security.accessControlList[1].id").value(ORGANIZATION_USER_EMAIL))
12661236
.andDo(MockMvcResultHandlers.print())
12671237
}

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

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,13 +2304,22 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
23042304
val datasetTags = mutableListOf("dataset", "public", "customers")
23052305
val datasetAdditionalData =
23062306
mutableMapOf("dataset" to "data", "complex" to mutableMapOf("nested" to "data"))
2307+
2308+
val datasetSecurity =
2309+
DatasetSecurity(
2310+
default = ROLE_NONE,
2311+
accessControlList =
2312+
mutableListOf(
2313+
DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
2314+
DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR)))
23072315
val datasetCreateRequest =
23082316
DatasetCreateRequest(
23092317
name = datasetName,
23102318
description = datasetDescription,
23112319
tags = datasetTags,
23122320
additionalData = datasetAdditionalData,
2313-
parts = mutableListOf(datasetPartCreateRequest))
2321+
parts = mutableListOf(datasetPartCreateRequest),
2322+
security = datasetSecurity)
23142323

23152324
val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
23162325

@@ -2348,21 +2357,13 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
23482357
val newDatasetDescription = "Dataset for shop"
23492358
val newDatasetTags = mutableListOf("dataset", "public", "shop")
23502359
val newDatasetAdditionalData = mutableMapOf<String, Any>("dataset" to "new data")
2351-
val newDatasetSecurity =
2352-
DatasetSecurity(
2353-
default = ROLE_NONE,
2354-
accessControlList =
2355-
mutableListOf(
2356-
DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
2357-
DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR)))
23582360
val datasetUpdateRequest =
23592361
DatasetUpdateRequest(
23602362
name = newDatasetName,
23612363
description = newDatasetDescription,
23622364
tags = newDatasetTags,
23632365
additionalData = newDatasetAdditionalData,
2364-
parts = mutableListOf(newDatasetPartCreateRequest),
2365-
security = newDatasetSecurity)
2366+
parts = mutableListOf(newDatasetPartCreateRequest))
23662367

23672368
val newDatasetPartTestFile =
23682369
resourceLoader.getResource("classpath:/$INVENTORY_SOURCE_FILE_NAME").file
@@ -2389,7 +2390,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
23892390
assertEquals(newDatasetName, updatedDataset.name)
23902391
assertEquals(newDatasetDescription, updatedDataset.description)
23912392
assertEquals(newDatasetTags, updatedDataset.tags)
2392-
assertEquals(newDatasetSecurity, updatedDataset.security)
2393+
assertEquals(datasetSecurity, updatedDataset.security)
23932394
assertEquals(createdDataset.createInfo, updatedDataset.createInfo)
23942395
assertEquals(createdDataset.updateInfo.userId, updatedDataset.updateInfo.userId)
23952396
assertTrue(createdDataset.updateInfo.timestamp < updatedDataset.updateInfo.timestamp)
@@ -2509,8 +2510,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
25092510
description = newDatasetDescription,
25102511
tags = newDatasetTags,
25112512
additionalData = newDatasetAdditionalData,
2512-
parts = mutableListOf(newDatasetPartCreateRequest),
2513-
security = newDatasetSecurity)
2513+
parts = mutableListOf(newDatasetPartCreateRequest))
25142514

25152515
val newDatasetPartTestFile =
25162516
resourceLoader.getResource("classpath:/$CUSTOMER_ZIPPED_SOURCE_FILE_NAME").file
@@ -2708,12 +2708,21 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
27082708
tags = mutableListOf("part", "public", "customers"),
27092709
type = DatasetPartTypeEnum.File)
27102710

2711+
val datasetSecurity =
2712+
DatasetSecurity(
2713+
default = ROLE_NONE,
2714+
accessControlList =
2715+
mutableListOf(
2716+
DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
2717+
DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR)))
2718+
27112719
val datasetCreateRequest =
27122720
DatasetCreateRequest(
27132721
name = "Customer Dataset",
27142722
description = "Dataset for customers",
27152723
tags = mutableListOf("dataset", "public", "customers"),
2716-
parts = mutableListOf(datasetPartCreateRequest))
2724+
parts = mutableListOf(datasetPartCreateRequest),
2725+
security = datasetSecurity)
27172726

27182727
val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
27192728

@@ -2747,14 +2756,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
27472756
name = "Shop Dataset",
27482757
description = "Dataset for shop",
27492758
tags = mutableListOf("dataset", "public", "shop"),
2750-
parts = mutableListOf(newDatasetPartCreateRequest),
2751-
security =
2752-
DatasetSecurity(
2753-
default = ROLE_NONE,
2754-
accessControlList =
2755-
mutableListOf(
2756-
DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
2757-
DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR))))
2759+
parts = mutableListOf(newDatasetPartCreateRequest))
27582760

27592761
val wrongTypeTestFile =
27602762
resourceLoader.getResource("classpath:/$UNALLOWED_MIME_TYPE_SOURCE_FILE_NAME").file
@@ -2799,7 +2801,14 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
27992801
name = "Customer Dataset",
28002802
description = "Dataset for customers",
28012803
tags = mutableListOf("dataset", "public", "customers"),
2802-
parts = mutableListOf(datasetPartCreateRequest))
2804+
parts = mutableListOf(datasetPartCreateRequest),
2805+
security =
2806+
DatasetSecurity(
2807+
default = ROLE_NONE,
2808+
accessControlList =
2809+
mutableListOf(
2810+
DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
2811+
DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR))))
28032812

28042813
val resourceTestFile = resourceLoader.getResource("classpath:/$CUSTOMER_SOURCE_FILE_NAME").file
28052814

@@ -2833,14 +2842,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
28332842
name = "Shop Dataset",
28342843
description = "Dataset for shop",
28352844
tags = mutableListOf("dataset", "public", "shop"),
2836-
parts = mutableListOf(newDatasetPartCreateRequest),
2837-
security =
2838-
DatasetSecurity(
2839-
default = ROLE_NONE,
2840-
accessControlList =
2841-
mutableListOf(
2842-
DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
2843-
DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR))))
2845+
parts = mutableListOf(newDatasetPartCreateRequest))
28442846

28452847
val wrongTypeMockMultipartFile =
28462848
MockMultipartFile(

‎dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ class DatasetServiceImpl(
357357
DatasetEditInfo(
358358
timestamp = Instant.now().toEpochMilli(),
359359
userId = getCurrentAccountIdentifier(csmPlatformProperties)),
360-
security = datasetUpdateRequest.security ?: previousDataset.security)
360+
security = previousDataset.security)
361361

362362
logger.debug("New Dataset info to register: {}", updatedDataset)
363363

‎dataset/src/main/openapi/dataset.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,8 +879,6 @@ components:
879879
type: array
880880
items:
881881
$ref: '#/components/schemas/DatasetPartCreateRequest'
882-
security:
883-
$ref: '#/components/schemas/DatasetSecurity'
884882

885883
# main Dataset Part object
886884
DatasetPart:

‎doc/Models/DatasetUpdateRequest.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
| **tags** | **List** | | [optional] [default to null] |
99
| **additionalData** | [**Map**](AnyType.md) | Free form additional data | [optional] [default to null] |
1010
| **parts** | [**List**](DatasetPartCreateRequest.md) | | [optional] [default to null] |
11-
| **security** | [**DatasetSecurity**](DatasetSecurity.md) | | [optional] [default to null] |
1211

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

‎openapi/plantuml/schemas.plantuml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ entity DatasetUpdateRequest {
117117
tags: List<String>
118118
additionalData: Map
119119
parts: List<DatasetPartCreateRequest>
120-
security: DatasetSecurity
121120
}
122121

123122
entity LastRunInfo {
@@ -618,7 +617,6 @@ RunStatus -- RunEditInfo : createInfo
618617
RunStatus -- "0..*" RunStatusNode : nodes
619618
RunTemplate -- RunTemplateResourceSizing : runSizing
620619
DatasetUpdateRequest -- "0..*" DatasetPartCreateRequest : parts
621-
DatasetUpdateRequest -- DatasetSecurity : security
622620
RunTemplateCreateRequest -- RunTemplateResourceSizing : runSizing
623621
RunnerSecurity -- "0..*" RunnerAccessControl : accessControlList
624622
RunStatusNode -- RunResourceRequested : resourcesDuration

0 commit comments

Comments
 (0)