Skip to content

Commit 5495be3

Browse files
jreynard-codejreynard-code
committed
Remove RDS and Postgres admin role in API configuration
As we remove the PostgreSQL admin role in API configuration (not needed afterward), we also remove the RDS initiative: - it was not used - it has to be maintained for nothing - outputs will not be part of CoAL / csm-orc libraries
1 parent 89ac5a1 commit 5495be3

File tree

31 files changed

+8
-1077
lines changed

31 files changed

+8
-1077
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ abstract class ControllerTestBase : AbstractTestcontainersRedisTestBase() {
152152
private fun initPostgresConfiguration(registry: DynamicPropertyRegistry) {
153153
registry.add("csm.platform.databases.data.host") { postgres.host }
154154
registry.add("csm.platform.databases.data.port") { postgres.getMappedPort(POSTGRESQL_PORT) }
155-
registry.add("csm.platform.databases.data.admin.username") { ADMIN_USER_CREDENTIALS }
156-
registry.add("csm.platform.databases.data.admin.password") { ADMIN_USER_CREDENTIALS }
157155
registry.add("csm.platform.databases.data.writer.username") { WRITER_USER_CREDENTIALS }
158156
registry.add("csm.platform.databases.data.writer.password") { WRITER_USER_CREDENTIALS }
159157
registry.add("csm.platform.databases.data.reader.username") { READER_USER_CREDENTIALS }

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/run/RunControllerTests.kt‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import com.cosmotech.api.home.run.RunConstants.RequestContent.CONTAINER_NAME
2323
import com.cosmotech.api.home.run.RunConstants.RequestContent.CONTAINER_NODE_LABEL
2424
import com.cosmotech.api.home.run.RunConstants.RequestContent.CONTAINER_RUN_ARGS
2525
import com.cosmotech.api.home.run.RunConstants.RequestContent.CSM_SIMULATION_RUN
26-
import com.cosmotech.api.home.run.RunConstants.RequestContent.CUSTOM_DATA_QUERY
27-
import com.cosmotech.api.home.run.RunConstants.RequestContent.CUSTOM_DATA_TABLE_NAME
2826
import com.cosmotech.api.home.run.RunConstants.RequestContent.DATASET_LIST
2927
import com.cosmotech.api.home.run.RunConstants.RequestContent.DESCRIPTION
3028
import com.cosmotech.api.home.run.RunConstants.RequestContent.HOST_NODE_NAME
@@ -277,107 +275,6 @@ class RunControllerTests : ControllerTestBase() {
277275
"organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/DELETE"))
278276
}
279277

280-
@Test
281-
@WithMockOauth2User
282-
fun send_data_run() {
283-
284-
every { eventPublisher.publishEvent(any()) } answers
285-
{
286-
firstArg<UpdateRunnerStatus>().response = "Running"
287-
}
288-
289-
val dataToSend =
290-
"""{
291-
"id": "my_table",
292-
"data": [
293-
{
294-
"additionalProp1": {},
295-
"additionalProp2": "test",
296-
"additionalProp3": 100
297-
},
298-
{
299-
"additionalProp1": {},
300-
"additionalProp2": "test",
301-
"additionalProp4": 1000
302-
}
303-
]
304-
}"""
305-
mvc.perform(
306-
post(
307-
"/organizations/$organizationId/workspaces/$workspaceId/runners/$runnerId}/runs/$runId/data/send")
308-
.contentType(MediaType.APPLICATION_JSON)
309-
.content(dataToSend)
310-
.accept(MediaType.APPLICATION_JSON)
311-
.with(csrf()))
312-
.andExpect(status().is2xxSuccessful)
313-
.andExpect(jsonPath("$.database_name").value(runId))
314-
.andExpect(jsonPath("$.table_name").value(CUSTOM_DATA_TABLE_NAME))
315-
.andExpect(jsonPath("$.data[0].additionalProp1").value(""))
316-
.andExpect(jsonPath("$.data[0].additionalProp2").value("test"))
317-
.andExpect(jsonPath("$.data[0].additionalProp3").value(100))
318-
.andExpect(jsonPath("$.data[1].additionalProp1").value(""))
319-
.andExpect(jsonPath("$.data[1].additionalProp2").value("test"))
320-
.andExpect(jsonPath("$.data[1].additionalProp4").value(1000))
321-
.andDo(MockMvcResultHandlers.print())
322-
.andDo(
323-
document(
324-
"organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/data/send/POST"))
325-
}
326-
327-
@Test
328-
@WithMockOauth2User
329-
fun query_data_run() {
330-
331-
every { eventPublisher.publishEvent(any()) } answers
332-
{
333-
firstArg<UpdateRunnerStatus>().response = "Running"
334-
}
335-
336-
val dataToSend =
337-
"""{
338-
"id": "my_table",
339-
"data": [
340-
{
341-
"additionalProp1": {},
342-
"additionalProp2": "test",
343-
"additionalProp3": 100
344-
},
345-
{
346-
"additionalProp1": {},
347-
"additionalProp2": "test",
348-
"additionalProp4": 1000
349-
}
350-
]
351-
}"""
352-
mvc.perform(
353-
post(
354-
"/organizations/$organizationId/workspaces/$workspaceId/runners/$runnerId}/runs/$runId/data/send")
355-
.contentType(MediaType.APPLICATION_JSON)
356-
.content(dataToSend)
357-
.accept(MediaType.APPLICATION_JSON)
358-
.with(csrf()))
359-
.andExpect(status().is2xxSuccessful)
360-
361-
mvc.perform(
362-
post(
363-
"/organizations/$organizationId/workspaces/$workspaceId/runners/$runnerId}/runs/$runId/data/query")
364-
.contentType(MediaType.APPLICATION_JSON)
365-
.content(CUSTOM_DATA_QUERY)
366-
.accept(MediaType.APPLICATION_JSON)
367-
.with(csrf()))
368-
.andExpect(status().is2xxSuccessful)
369-
.andExpect(jsonPath("$.result[0].additionalprop1").value(""))
370-
.andExpect(jsonPath("$.result[0].additionalprop2").value("test"))
371-
.andExpect(jsonPath("$.result[0].additionalprop3").value(100))
372-
.andExpect(jsonPath("$.result[1].additionalprop1").value(""))
373-
.andExpect(jsonPath("$.result[1].additionalprop2").value("test"))
374-
.andExpect(jsonPath("$.result[1].additionalprop4").value(1000))
375-
.andDo(MockMvcResultHandlers.print())
376-
.andDo(
377-
document(
378-
"organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/data/query/POST"))
379-
}
380-
381278
@Test
382279
@WithMockOauth2User
383280
fun get_run_logs() {

‎api/src/integrationTest/resources/application-test.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,8 @@ csm:
107107
tls:
108108
enabled: false
109109
bundle: ""
110-
connector:
111-
default-page-size: 5
112110
data:
113-
schema: "postgres"
114-
admin:
115-
password: "password"
116-
username: cosmotech_api_admin
111+
database: "postgres"
117112
host: "localhost"
118113
port: 5432
119114
reader:

‎api/src/integrationTest/resources/init-db.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
CREATE USER readusertest WITH PASSWORD 'readusertest';
2-
CREATE USER adminusertest WITH SUPERUSER PASSWORD 'adminusertest';
32
CREATE USER writeusertest WITH PASSWORD 'writeusertest';

‎common/src/main/kotlin/com/cosmotech/common/config/CsmPlatformProperties.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,17 +331,14 @@ data class CsmPlatformProperties(
331331
/** Storage port */
332332
val port: Int = 5432,
333333

334-
/** Storage schema */
335-
val schema: String = "cosmotech",
334+
/** Storage database */
335+
val database: String = "cosmotech",
336336

337337
/** Storage reader user configuration */
338338
val reader: CsmStorageUser,
339339

340340
/** Storage writer user configuration */
341-
val writer: CsmStorageUser,
342-
343-
/** Storage admin user configuration */
344-
val admin: CsmStorageUser
341+
val writer: CsmStorageUser
345342
) {
346343
data class CsmStorageUser(val username: String, val password: String)
347344
}

‎common/src/main/kotlin/com/cosmotech/common/config/PostgresConfiguration.kt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,7 @@ class PostgresConfiguration(val csmPlatformProperties: CsmPlatformProperties) {
1515
private val jdbcUrl =
1616
"jdbc:postgresql://${csmPlatformProperties.databases.data.host}" +
1717
":${csmPlatformProperties.databases.data.port}" +
18-
"/${csmPlatformProperties.databases.data.schema}"
19-
20-
@Bean
21-
fun adminUserJdbcTemplate(): JdbcTemplate {
22-
val dataSource =
23-
DriverManagerDataSource(
24-
jdbcUrl,
25-
csmPlatformProperties.databases.data.admin.username,
26-
csmPlatformProperties.databases.data.admin.password)
27-
dataSource.setDriverClassName(jdbcDriverClass)
28-
return JdbcTemplate(dataSource)
29-
}
18+
"/${csmPlatformProperties.databases.data.database}"
3019

3120
@Bean
3221
fun readerJdbcTemplate(): JdbcTemplate {

‎common/src/main/kotlin/com/cosmotech/common/tests/CsmTestBase.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import org.testcontainers.utility.MountableFile
2020
open class CsmTestBase : AbstractTestcontainersRedisTestBase() {
2121

2222
companion object {
23-
private const val ADMIN_USER_CREDENTIALS = "adminusertest"
2423
private const val READER_USER_CREDENTIALS = "readusertest"
2524
private const val WRITER_USER_CREDENTIALS = "writeusertest"
2625
private const val DEFAULT_REDIS_PORT = 6379
@@ -72,10 +71,7 @@ open class CsmTestBase : AbstractTestcontainersRedisTestBase() {
7271

7372
private fun initPostgresConfiguration(registry: DynamicPropertyRegistry) {
7473
registry.add("csm.platform.databases.data.host") { postgres.host }
75-
registry.add("csm.platform.databases.data.schema") { postgres.databaseName }
7674
registry.add("csm.platform.databases.data.port") { postgres.getMappedPort(POSTGRESQL_PORT) }
77-
registry.add("csm.platform.databases.data.admin.username") { ADMIN_USER_CREDENTIALS }
78-
registry.add("csm.platform.databases.data.admin.password") { ADMIN_USER_CREDENTIALS }
7975
registry.add("csm.platform.databases.data.writer.username") { WRITER_USER_CREDENTIALS }
8076
registry.add("csm.platform.databases.data.writer.password") { WRITER_USER_CREDENTIALS }
8177
registry.add("csm.platform.databases.data.reader.username") { READER_USER_CREDENTIALS }

‎dataset/src/integrationTest/resources/application-dataset-test.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,7 @@ csm:
106106
tls:
107107
enabled: false
108108
bundle: ""
109-
connector:
110-
default-page-size: 5
111109
data:
112-
admin:
113-
password: "password"
114-
username: cosmotech_api_admin
115110
host: "localhost"
116111
port: 5432
117112
reader:

‎dataset/src/integrationTest/resources/init-db.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
CREATE USER readusertest WITH PASSWORD 'readusertest';
2-
CREATE USER adminusertest WITH SUPERUSER PASSWORD 'adminusertest';
32
CREATE USER writeusertest WITH PASSWORD 'writeusertest';

‎doc/.openapi-generator/FILES‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ Models/OrganizationEditInfo.md
3131
Models/OrganizationRole.md
3232
Models/OrganizationSecurity.md
3333
Models/OrganizationUpdateRequest.md
34-
Models/QueryResult.md
3534
Models/ResourceSizeInfo.md
3635
Models/Run.md
3736
Models/RunContainer.md
38-
Models/RunData.md
39-
Models/RunDataQuery.md
4037
Models/RunEditInfo.md
4138
Models/RunResourceRequested.md
4239
Models/RunState.md
@@ -64,7 +61,6 @@ Models/RunnerRunTemplateParameterValue.md
6461
Models/RunnerSecurity.md
6562
Models/RunnerUpdateRequest.md
6663
Models/RunnerValidationStatus.md
67-
Models/SendRunDataRequest.md
6864
Models/Solution.md
6965
Models/SolutionAccessControl.md
7066
Models/SolutionCreateRequest.md

0 commit comments

Comments
 (0)