Skip to content

Commit ab0b9dd

Browse files
brionmariobrionmario
committed
Update database credentials to use 'dbuser' and 'dbpassword' across configurations
1 parent 9394817 commit ab0b9dd

12 files changed

Lines changed: 53 additions & 53 deletions

File tree

‎.github/actions/run-integration-tests/action.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ runs:
3636
if: inputs.database-type == 'postgres'
3737
shell: bash
3838
run: |
39-
PGPASSWORD=asgthunder psql -h localhost -p 5432 -U asgthunder -d thunderdb -c "CREATE DATABASE configdb;"
40-
PGPASSWORD=asgthunder psql -h localhost -p 5432 -U asgthunder -d thunderdb -c "CREATE DATABASE runtimedb;"
41-
PGPASSWORD=asgthunder psql -h localhost -p 5432 -U asgthunder -d thunderdb -c "CREATE DATABASE userdb;"
42-
PGPASSWORD=asgthunder psql -h localhost -p 5432 -U asgthunder -d configdb < backend/dbscripts/configdb/postgres.sql
43-
PGPASSWORD=asgthunder psql -h localhost -p 5432 -U asgthunder -d runtimedb < backend/dbscripts/runtimedb/postgres.sql
44-
PGPASSWORD=asgthunder psql -h localhost -p 5432 -U asgthunder -d userdb < backend/dbscripts/userdb/postgres.sql
39+
PGPASSWORD=dbpassword psql -h localhost -p 5432 -U dbuser -d thunderdb -c "CREATE DATABASE configdb;"
40+
PGPASSWORD=dbpassword psql -h localhost -p 5432 -U dbuser -d thunderdb -c "CREATE DATABASE runtimedb;"
41+
PGPASSWORD=dbpassword psql -h localhost -p 5432 -U dbuser -d thunderdb -c "CREATE DATABASE userdb;"
42+
PGPASSWORD=dbpassword psql -h localhost -p 5432 -U dbuser -d configdb < backend/dbscripts/configdb/postgres.sql
43+
PGPASSWORD=dbpassword psql -h localhost -p 5432 -U dbuser -d runtimedb < backend/dbscripts/runtimedb/postgres.sql
44+
PGPASSWORD=dbpassword psql -h localhost -p 5432 -U dbuser -d userdb < backend/dbscripts/userdb/postgres.sql
4545
4646
- name: 📝 Configure Test Database
4747
shell: bash

‎.github/workflows/postgres-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ jobs:
133133
postgres:
134134
image: postgres:latest
135135
env:
136-
POSTGRES_USER: asgthunder
137-
POSTGRES_PASSWORD: asgthunder
136+
POSTGRES_USER: dbuser
137+
POSTGRES_PASSWORD: dbpassword
138138
POSTGRES_DB: thunderdb
139139
ports:
140140
- 5432:5432

‎.github/workflows/pr-builder.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@ jobs:
484484
postgres:
485485
image: postgres:latest
486486
env:
487-
POSTGRES_USER: asgthunder
488-
POSTGRES_PASSWORD: asgthunder
487+
POSTGRES_USER: dbuser
488+
POSTGRES_PASSWORD: dbpassword
489489
POSTGRES_DB: thunderdb
490490
ports:
491491
- 5432:5432

‎.github/workflows/release-builder.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ jobs:
285285
postgres:
286286
image: postgres:latest
287287
env:
288-
POSTGRES_USER: asgthunder
289-
POSTGRES_PASSWORD: asgthunder
288+
POSTGRES_USER: dbuser
289+
POSTGRES_PASSWORD: dbpassword
290290
POSTGRES_DB: thunderdb
291291
ports:
292292
- 5432:5432

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,24 +365,24 @@ docker compose down -v
365365
hostname: "localhost"
366366
port: 5432
367367
name: "configdb"
368-
username: "asgthunder"
369-
password: "asgthunder"
368+
username: "dbuser"
369+
password: "dbpassword"
370370
sslmode: "disable"
371371
runtime:
372372
type: "postgres"
373373
hostname: "localhost"
374374
port: 5432
375375
name: "runtimedb"
376-
username: "asgthunder"
377-
password: "asgthunder"
376+
username: "dbuser"
377+
password: "dbpassword"
378378
sslmode: "disable"
379379
user:
380380
type: "postgres"
381381
hostname: "localhost"
382382
port: 5432
383383
name: "userdb"
384-
username: "asgthunder"
385-
password: "asgthunder"
384+
username: "dbuser"
385+
password: "dbpassword"
386386
sslmode: "disable"
387387
```
388388

‎install/helm/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ Password fields are available in `configuration.database.config.postgres`, `conf
402402
| `configuration.database.config.postgres.name` | Postgres database name (for postgres only) | `configdb` |
403403
| `configuration.database.config.postgres.hostname` | Postgres hostname (for postgres only) | `localhost` |
404404
| `configuration.database.config.postgres.port` | Postgres port (for postgres only) | `5432` |
405-
| `configuration.database.config.postgres.username` | Postgres username (for postgres only) | `asgthunder` |
406-
| `configuration.database.config.postgres.password` | Config Postgres password - supports plaintext. When `passwordRef.key` is set, this field is ignored and the external Secret is used instead. | `asgthunder` |
405+
| `configuration.database.config.postgres.username` | Postgres username (for postgres only) | `dbuser` |
406+
| `configuration.database.config.postgres.password` | Config Postgres password - supports plaintext. When `passwordRef.key` is set, this field is ignored and the external Secret is used instead. | `dbpassword` |
407407
| `configuration.database.config.postgres.passwordRef.name` | Kubernetes Secret name for config Postgres password | `""` |
408408
| `configuration.database.config.postgres.passwordRef.key` | Kubernetes Secret key for config Postgres password | `""` |
409409
| `configuration.database.config.postgres.sslmode` | Postgres SSL mode (for postgres only) | `require` |
@@ -419,8 +419,8 @@ Password fields are available in `configuration.database.config.postgres`, `conf
419419
| `configuration.database.runtime.postgres.name` | Postgres database name (for postgres only) | `runtimedb` |
420420
| `configuration.database.runtime.postgres.hostname` | Postgres hostname (for postgres only) | `localhost` |
421421
| `configuration.database.runtime.postgres.port` | Postgres port (for postgres only) | `5432` |
422-
| `configuration.database.runtime.postgres.username` | Postgres username (for postgres only) | `asgthunder` |
423-
| `configuration.database.runtime.postgres.password` | Runtime Postgres password - supports plaintext. When `passwordRef.key` is set, this field is ignored and the external Secret is used instead. | `asgthunder` |
422+
| `configuration.database.runtime.postgres.username` | Postgres username (for postgres only) | `dbuser` |
423+
| `configuration.database.runtime.postgres.password` | Runtime Postgres password - supports plaintext. When `passwordRef.key` is set, this field is ignored and the external Secret is used instead. | `dbpassword` |
424424
| `configuration.database.runtime.postgres.passwordRef.name` | Kubernetes Secret name for runtime Postgres password | `""` |
425425
| `configuration.database.runtime.postgres.passwordRef.key` | Kubernetes Secret key for runtime Postgres password | `""` |
426426
| `configuration.database.runtime.postgres.sslmode` | Postgres SSL mode (for postgres only) | `require` |
@@ -443,8 +443,8 @@ Password fields are available in `configuration.database.config.postgres`, `conf
443443
| `configuration.database.user.postgres.name` | Postgres database name (for postgres only) | `userdb` |
444444
| `configuration.database.user.postgres.hostname` | Postgres hostname (for postgres only) | `localhost` |
445445
| `configuration.database.user.postgres.port` | Postgres port (for postgres only) | `5432` |
446-
| `configuration.database.user.postgres.username` | Postgres username (for postgres only) | `asgthunder` |
447-
| `configuration.database.user.postgres.password` | User Postgres password - supports plaintext. When `passwordRef.key` is set, this field is ignored and the external Secret is used instead. | `asgthunder` |
446+
| `configuration.database.user.postgres.username` | Postgres username (for postgres only) | `dbuser` |
447+
| `configuration.database.user.postgres.password` | User Postgres password - supports plaintext. When `passwordRef.key` is set, this field is ignored and the external Secret is used instead. | `dbpassword` |
448448
| `configuration.database.user.postgres.passwordRef.name` | Kubernetes Secret name for user Postgres password | `""` |
449449
| `configuration.database.user.postgres.passwordRef.key` | Kubernetes Secret key for user Postgres password | `""` |
450450
| `configuration.database.user.postgres.sslmode` | Postgres SSL mode (for postgres only) | `require` |

‎install/helm/values.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ configuration:
242242
hostname: "localhost"
243243
port: "5432"
244244
name: "configdb"
245-
username: "asgthunder"
246-
password: "asgthunder"
245+
username: "dbuser"
246+
password: "dbpassword"
247247
passwordRef:
248248
name: ""
249249
key: ""
@@ -271,8 +271,8 @@ configuration:
271271
hostname: "localhost"
272272
port: "5432"
273273
name: "runtimedb"
274-
username: "asgthunder"
275-
password: "asgthunder"
274+
username: "dbuser"
275+
password: "dbpassword"
276276
passwordRef:
277277
name: ""
278278
key: ""
@@ -308,8 +308,8 @@ configuration:
308308
hostname: "localhost"
309309
port: "5432"
310310
name: "userdb"
311-
username: "asgthunder"
312-
password: "asgthunder"
311+
username: "dbuser"
312+
password: "dbpassword"
313313
passwordRef:
314314
name: ""
315315
key: ""
@@ -398,8 +398,8 @@ configuration:
398398
name: "consentdb"
399399
host: "localhost"
400400
port: "5432"
401-
username: "asgthunder"
402-
password: "asgthunder"
401+
username: "dbuser"
402+
password: "dbpassword"
403403
sslmode: "require"
404404
max_open_conns: 500
405405
max_idle_conns: 100

‎install/local-development/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ services:
66
container_name: local_postgres
77
restart: always
88
environment:
9-
POSTGRES_USER: asgthunder
10-
POSTGRES_PASSWORD: asgthunder
9+
POSTGRES_USER: dbuser
10+
POSTGRES_PASSWORD: dbpassword
1111
ports:
1212
- "5432:5432"
1313
volumes:

‎install/local-development/redis/docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ services:
1919
image: redis:7-alpine
2020
restart: always
2121
environment:
22-
REDIS_USERNAME: asgthunder
23-
REDIS_PASSWORD: asgthunder
22+
REDIS_USERNAME: dbuser
23+
REDIS_PASSWORD: dbpassword
2424
command: >
2525
redis-server
2626
--user default off
27-
--user asgthunder on ">asgthunder" ~* &* +@all
27+
--user dbuser on ">dbpassword" ~* &* +@all
2828
ports:
2929
- "6379:6379"
3030
volumes:

‎install/openchoreo/helm/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ helm upgrade --install thunder install/openchoreo/helm/ \
137137
```bash
138138
export DB_HOST="postgres.example.com"
139139
export DB_NAME="thunderdb"
140-
export DB_USER="thunder"
140+
export DB_USER="dbuser"
141141
export DB_PASS="<your-password>"
142142
export SERVER_PUBLIC_URL="http://development-thunder-identity-platform.openchoreoapis.localhost:19080"
143143
export GATE_HOSTNAME="development-thunder-identity-platform.openchoreoapis.localhost"
@@ -369,16 +369,16 @@ Use this to derive the following values when configuring the Component via the U
369369
Create the database and grant privileges before setting these values:
370370

371371
```sql
372-
CREATE DATABASE thunderdb OWNER asgthunder;
373-
GRANT ALL PRIVILEGES ON DATABASE thunderdb TO asgthunder;
372+
CREATE DATABASE thunderdb OWNER dbuser;
373+
GRANT ALL PRIVILEGES ON DATABASE thunderdb TO dbuser;
374374
```
375375

376376
| Environment Variable | How to get |
377377
|---------|------------|
378378
| `DB_PORT` | PostgreSQL port — must be an integer (not quoted) |
379379
| `DB_CONFIG_HOSTNAME` | PostgreSQL hostname e.g. `postgres-postgresql.identity-platform.svc.cluster.local` |
380380
| `DB_CONFIG_NAME` | Database name created in the SQL above |
381-
| `DB_CONFIG_USERNAME` | PostgreSQL application user e.g. `asgthunder` |
381+
| `DB_CONFIG_USERNAME` | PostgreSQL application user e.g. `dbuser` |
382382
| `DB_CONFIG_PASSWORD` | Password for the application user |
383383
| `DB_CONFIG_SSLMODE` | `disable`, `require`, or `verify-full` (recommended for production) |
384384
| `DB_RUNTIME_HOSTNAME` | Same as `DB_CONFIG_HOSTNAME` unless using separate DB hosts |

0 commit comments

Comments
 (0)