diff --git a/src/lib/db/aws-iam.ts b/src/lib/db/aws-iam.ts index 03da0e57a9..97c50f48bc 100644 --- a/src/lib/db/aws-iam.ts +++ b/src/lib/db/aws-iam.ts @@ -14,14 +14,9 @@ export const getDBPasswordResolver = (db: IDBOption): PasswordResolver => { region: db.awsRegion, hostname: db.host, port: db.port, - username: process.env.DATABASE_USERNAME || db.user, + username: db.user, }); - return async () => { - console.log('[AWS RDS SIGNER] Getting token...'); - const token = await signer.getAuthToken(); - console.log(`[AWS RDS SIGNER] Got token: ${token}`); - return token; - }; + return async () => signer.getAuthToken(); } return async () => db.password; diff --git a/src/lib/db/db-pool.ts b/src/lib/db/db-pool.ts index 16e32275dc..244a7c7fa8 100644 --- a/src/lib/db/db-pool.ts +++ b/src/lib/db/db-pool.ts @@ -9,20 +9,11 @@ export function createDb({ getLogger, }: Pick): Knex { const logger = getLogger('db-pool.js'); - - logger.info( - `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({ client: 'pg', version: db.version, connection: { ...db, - user: process.env.DATABASE_USERNAME || db.user, application_name: db.applicationName, password: getDBPasswordResolver(db), },