diff --git a/api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt b/api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt index 555a51b1e..de9fe58fa 100644 --- a/api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt +++ b/api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt @@ -438,7 +438,6 @@ class ControllerTestUtils { description = DATASET_DESCRIPTION, tags = mutableListOf("tag1", "tag2"), additionalData = mutableMapOf("customClient" to "customDatasetData"), - runnerId = "r-12345678910", parts = mutableListOf( DatasetPartCreateRequest( diff --git a/api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt b/api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt index ab5208360..45c6b08a2 100644 --- a/api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt +++ b/api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt @@ -141,7 +141,6 @@ class DatasetControllerTests : ControllerTestBase() { .andExpect(jsonPath("$.organizationId").value(organizationId)) .andExpect(jsonPath("$.workspaceId").value(workspaceId)) .andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL)) - .andExpect(jsonPath("$.createInfo.runnerId").value("r-12345678910")) .andExpect(jsonPath("$.createInfo.timestamp").isNumber) .andExpect(jsonPath("$.createInfo.timestamp").value(greaterThan(0.toLong()))) .andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL)) @@ -180,8 +179,7 @@ class DatasetControllerTests : ControllerTestBase() { DatasetCreateRequest( name = DATASET_NAME, description = DATASET_DESCRIPTION, - tags = mutableListOf("tag1", "tag2"), - runnerId = "r-12345678910")) + tags = mutableListOf("tag1", "tag2"))) .toString() .byteInputStream()) @@ -197,7 +195,6 @@ class DatasetControllerTests : ControllerTestBase() { .andExpect(jsonPath("$.workspaceId").value(workspaceId)) .andExpect(jsonPath("$.parts", empty())) .andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL)) - .andExpect(jsonPath("$.createInfo.runnerId").value("r-12345678910")) .andExpect(jsonPath("$.createInfo.timestamp").isNumber) .andExpect(jsonPath("$.createInfo.timestamp").value(greaterThan(0.toLong()))) .andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL)) @@ -223,8 +220,7 @@ class DatasetControllerTests : ControllerTestBase() { name = DATASET_NAME, description = DATASET_DESCRIPTION, tags = mutableListOf("tag1", "tag2"), - parts = mutableListOf(), - runnerId = "r-12345678910")) + parts = mutableListOf())) .toString() .byteInputStream()) @@ -240,7 +236,6 @@ class DatasetControllerTests : ControllerTestBase() { .andExpect(jsonPath("$.workspaceId").value(workspaceId)) .andExpect(jsonPath("$.parts", empty())) .andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL)) - .andExpect(jsonPath("$.createInfo.runnerId").value("r-12345678910")) .andExpect(jsonPath("$.createInfo.timestamp").isNumber) .andExpect(jsonPath("$.createInfo.timestamp").value(greaterThan(0.toLong()))) .andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL)) diff --git a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt index 6e53acb1f..caf633cbb 100644 --- a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt +++ b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt @@ -152,10 +152,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() { val datasetTags = mutableListOf("dataset", "public", "customers") val datasetCreateRequest = DatasetCreateRequest( - name = datasetName, - description = datasetDescription, - tags = datasetTags, - runnerId = "r-12354678910") + name = datasetName, description = datasetDescription, tags = datasetTags) val createdDataset = datasetApiService.createDataset( @@ -165,7 +162,6 @@ class DatasetServiceIntegrationTest() : CsmTestBase() { assertEquals(datasetName, createdDataset.name) assertEquals(datasetDescription, createdDataset.description) assertEquals(datasetTags, createdDataset.tags) - assertEquals("r-12354678910", createdDataset.createInfo.runnerId) assertEquals(0, createdDataset.parts.size) } diff --git a/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt b/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt index d14bfba6b..ab7dba6c5 100644 --- a/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt +++ b/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt @@ -27,7 +27,6 @@ import com.cosmotech.common.utils.sanitizeDatasetPartId import com.cosmotech.dataset.DatasetApiServiceInterface import com.cosmotech.dataset.domain.Dataset import com.cosmotech.dataset.domain.DatasetAccessControl -import com.cosmotech.dataset.domain.DatasetCreateInfo import com.cosmotech.dataset.domain.DatasetCreateRequest import com.cosmotech.dataset.domain.DatasetEditInfo import com.cosmotech.dataset.domain.DatasetPart @@ -152,9 +151,7 @@ class DatasetServiceImpl( val now = Instant.now().toEpochMilli() val userId = getCurrentAccountIdentifier(csmPlatformProperties) val editInfo = DatasetEditInfo(timestamp = now, userId = userId) - val createInfo = - DatasetCreateInfo( - timestamp = now, userId = userId, runnerId = datasetCreateRequest.runnerId) + val createInfo = DatasetEditInfo(timestamp = now, userId = userId) val security = csmRbac .initSecurity(datasetCreateRequest.security.toGenericSecurity(datasetId)) diff --git a/dataset/src/main/openapi/dataset.yaml b/dataset/src/main/openapi/dataset.yaml index b65943dba..71a0abe87 100644 --- a/dataset/src/main/openapi/dataset.yaml +++ b/dataset/src/main/openapi/dataset.yaml @@ -807,7 +807,7 @@ components: createInfo: description: The details of the Dataset creation allOf: - - $ref: '#/components/schemas/DatasetCreateInfo' + - $ref: '#/components/schemas/DatasetEditInfo' updateInfo: description: The details of the Dataset last update allOf: @@ -853,9 +853,6 @@ components: default: [] security: $ref: '#/components/schemas/DatasetSecurity' - runnerId: - type: string - pattern: '^r-\w{10,20}' required: - name @@ -1075,24 +1072,6 @@ components: userId: description: The id of the user who did the modification type: string - required: - - timestamp - - userId - - DatasetCreateInfo: - type: object - properties: - timestamp: - description: The timestamp of the creation in millisecond - type: integer - format: int64 - userId: - description: The id of the user who did the creation - type: string - runnerId: - description: The runner id which has created the dataset (nullable) - type: string - pattern: '^r-\w{10,20}' required: - timestamp - userId \ No newline at end of file diff --git a/doc/.openapi-generator/FILES b/doc/.openapi-generator/FILES index 7ed491a91..0d7bcd8c7 100644 --- a/doc/.openapi-generator/FILES +++ b/doc/.openapi-generator/FILES @@ -13,7 +13,6 @@ Models/ContainerResourceSizing.md Models/CreatedRun.md Models/Dataset.md Models/DatasetAccessControl.md -Models/DatasetCreateInfo.md Models/DatasetCreateRequest.md Models/DatasetEditInfo.md Models/DatasetPart.md diff --git a/doc/Models/Dataset.md b/doc/Models/Dataset.md index b09fd2532..ac1c7b38c 100644 --- a/doc/Models/Dataset.md +++ b/doc/Models/Dataset.md @@ -11,7 +11,7 @@ | **tags** | **List** | the list of tags | [default to null] | | **additionalData** | [**Map**](AnyType.md) | Free form additional data | [optional] [default to null] | | **parts** | [**List**](DatasetPart.md) | | [default to null] | -| **createInfo** | [**DatasetCreateInfo**](DatasetCreateInfo.md) | The details of the Dataset creation | [default to null] | +| **createInfo** | [**DatasetEditInfo**](DatasetEditInfo.md) | The details of the Dataset creation | [default to null] | | **updateInfo** | [**DatasetEditInfo**](DatasetEditInfo.md) | The details of the Dataset last update | [default to null] | | **security** | [**DatasetSecurity**](DatasetSecurity.md) | | [default to null] | diff --git a/doc/Models/DatasetCreateInfo.md b/doc/Models/DatasetCreateInfo.md deleted file mode 100644 index 6d9fd3805..000000000 --- a/doc/Models/DatasetCreateInfo.md +++ /dev/null @@ -1,11 +0,0 @@ -# DatasetCreateInfo -## Properties - -| Name | Type | Description | Notes | -|------------ | ------------- | ------------- | -------------| -| **timestamp** | **Long** | The timestamp of the creation in millisecond | [default to null] | -| **userId** | **String** | The id of the user who did the creation | [default to null] | -| **runnerId** | **String** | The runner id which has created the dataset (nullable) | [optional] [default to null] | - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/doc/Models/DatasetCreateRequest.md b/doc/Models/DatasetCreateRequest.md index c0389235f..c62aa38ae 100644 --- a/doc/Models/DatasetCreateRequest.md +++ b/doc/Models/DatasetCreateRequest.md @@ -9,7 +9,6 @@ | **additionalData** | [**Map**](AnyType.md) | Free form additional data | [optional] [default to null] | | **parts** | [**List**](DatasetPartCreateRequest.md) | | [optional] [default to []] | | **security** | [**DatasetSecurity**](DatasetSecurity.md) | | [optional] [default to null] | -| **runnerId** | **String** | | [optional] [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/doc/README.md b/doc/README.md index d728008a9..40591c1bb 100644 --- a/doc/README.md +++ b/doc/README.md @@ -121,7 +121,6 @@ All URIs are relative to *http://localhost:8080* - [CreatedRun](./Models/CreatedRun.md) - [Dataset](./Models/Dataset.md) - [DatasetAccessControl](./Models/DatasetAccessControl.md) - - [DatasetCreateInfo](./Models/DatasetCreateInfo.md) - [DatasetCreateRequest](./Models/DatasetCreateRequest.md) - [DatasetEditInfo](./Models/DatasetEditInfo.md) - [DatasetPart](./Models/DatasetPart.md) diff --git a/openapi/plantuml/schemas.plantuml b/openapi/plantuml/schemas.plantuml index 8a9dadd34..1f5c809c6 100644 --- a/openapi/plantuml/schemas.plantuml +++ b/openapi/plantuml/schemas.plantuml @@ -44,7 +44,7 @@ entity Dataset { * tags: List additionalData: Map * parts: List - * createInfo: DatasetCreateInfo + * createInfo: DatasetEditInfo * updateInfo: DatasetEditInfo * security: DatasetSecurity } @@ -54,12 +54,6 @@ entity DatasetAccessControl { * role: String } -entity DatasetCreateInfo { - * timestamp: Long - * userId: String - runnerId: String -} - entity DatasetCreateRequest { * name: String description: String @@ -67,7 +61,6 @@ entity DatasetCreateRequest { additionalData: Map parts: List security: DatasetSecurity - runnerId: String } entity DatasetEditInfo { @@ -639,7 +632,7 @@ Solution -- "0..*" RunTemplateParameterGroup : parameterGroups Solution -- "0..*" RunTemplate : runTemplates Solution -- SolutionSecurity : security Dataset -- "0..*" DatasetPart : parts -Dataset -- DatasetCreateInfo : createInfo +Dataset -- DatasetEditInfo : createInfo Dataset -- DatasetEditInfo : updateInfo Dataset -- DatasetSecurity : security Run -- RunEditInfo : createInfo