Skip to content

Commit 19e1404

Browse files
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 8fbe623 commit 19e1404

File tree

30 files changed

+8
-974
lines changed

30 files changed

+8
-974
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/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:
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:
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

doc/Apis/RunApi.md

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ All URIs are relative to *http://localhost:8080*
99
| [**getRunLogs**](RunApi.md#getRunLogs) | **GET** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/logs | get the logs for the Run |
1010
| [**getRunStatus**](RunApi.md#getRunStatus) | **GET** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/status | get the status for the Run |
1111
| [**listRuns**](RunApi.md#listRuns) | **GET** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs | get the list of Runs for the Runner |
12-
| [**queryRunData**](RunApi.md#queryRunData) | **POST** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/data/query | query the run data |
13-
| [**sendRunData**](RunApi.md#sendRunData) | **POST** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/data/send | Send data associated to a run |
1412

1513

1614
<a name="deleteRun"></a>
@@ -154,61 +152,3 @@ get the list of Runs for the Runner
154152
- **Content-Type**: Not defined
155153
- **Accept**: application/json, application/yaml
156154

157-
<a name="queryRunData"></a>
158-
# **queryRunData**
159-
> QueryResult queryRunData(organization\_id, workspace\_id, runner\_id, run\_id, RunDataQuery)
160-
161-
query the run data
162-
163-
### Parameters
164-
165-
|Name | Type | Description | Notes |
166-
|------------- | ------------- | ------------- | -------------|
167-
| **organization\_id** | **String**| the Organization identifier | [default to null] |
168-
| **workspace\_id** | **String**| the Workspace identifier | [default to null] |
169-
| **runner\_id** | **String**| the Runner identifier | [default to null] |
170-
| **run\_id** | **String**| the Run identifier | [default to null] |
171-
| **RunDataQuery** | [**RunDataQuery**](../Models/RunDataQuery.md)| the query to run | |
172-
173-
### Return type
174-
175-
[**QueryResult**](../Models/QueryResult.md)
176-
177-
### Authorization
178-
179-
[oAuth2AuthCode](../README.md#oAuth2AuthCode)
180-
181-
### HTTP request headers
182-
183-
- **Content-Type**: application/json, application/yaml
184-
- **Accept**: application/json, application/yaml
185-
186-
<a name="sendRunData"></a>
187-
# **sendRunData**
188-
> RunData sendRunData(organization\_id, workspace\_id, runner\_id, run\_id, SendRunDataRequest)
189-
190-
Send data associated to a run
191-
192-
### Parameters
193-
194-
|Name | Type | Description | Notes |
195-
|------------- | ------------- | ------------- | -------------|
196-
| **organization\_id** | **String**| the Organization identifier | [default to null] |
197-
| **workspace\_id** | **String**| the Workspace identifier | [default to null] |
198-
| **runner\_id** | **String**| the Runner identifier | [default to null] |
199-
| **run\_id** | **String**| the Run identifier | [default to null] |
200-
| **SendRunDataRequest** | [**SendRunDataRequest**](../Models/SendRunDataRequest.md)| Custom data to register | |
201-
202-
### Return type
203-
204-
[**RunData**](../Models/RunData.md)
205-
206-
### Authorization
207-
208-
[oAuth2AuthCode](../README.md#oAuth2AuthCode)
209-
210-
### HTTP request headers
211-
212-
- **Content-Type**: application/json, application/yaml
213-
- **Accept**: application/json, application/yaml
214-

0 commit comments

Comments
 (0)