Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-09-05 17:53:12 +02:00
Code Issues Projects Releases Wiki Activity

chore: IAM auth username env var takes precedence (#10618)

Browse Source
This commit is contained in:
Nuno Góis 2025-09-04 14:01:27 +01:00 committed by GitHub
parent 07f6970eed
commit 9388ef66d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/db/aws-iam.ts
View File

@ -14,7 +14,7 @@ export const getDBPasswordResolver = (db: IDBOption): PasswordResolver => {
region: db.awsRegion, region: db.awsRegion,
hostname: db.host, hostname: db.host,
port: db.port, port: db.port,
username: db.user, username: process.env.DATABASE_USERNAME || db.user,
}); });
return async () => { return async () => {
console.log('[AWS RDS SIGNER] Getting token...'); console.log('[AWS RDS SIGNER] Getting token...');

6
src/lib/db/db-pool.ts
View File

@ -11,14 +11,18 @@ export function createDb({
const logger = getLogger('db-pool.js'); const logger = getLogger('db-pool.js');
logger.info( logger.info(
`createDb: iam=${Boolean(db.awsIamAuth)} host=${db.host} port=${db.port} db=${db.database} user=${db.user} ssl=${Boolean(db.ssl)}`, `createDb: iam=${Boolean(db.awsIamAuth)} host=${db.host} port=${db.port} db=${db.database} user=${process.env.DATABASE_USERNAME || db.user} ssl=${Boolean(db.ssl)}`,
); );
const { password, ...logDb } = db;
logger.info(`createDb (DB): ${JSON.stringify(logDb, undefined, 2)}`);
return knex({ return knex({
client: 'pg', client: 'pg',
version: db.version, version: db.version,
connection: { connection: {
...db, ...db,
user: process.env.DATABASE_USERNAME || db.user,
application_name: db.applicationName, application_name: db.applicationName,
password: getDBPasswordResolver(db), password: getDBPasswordResolver(db),
}, },