mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	chore: IAM auth username env var takes precedence (#10618)
This commit is contained in:
		
							parent
							
								
									07f6970eed
								
							
						
					
					
						commit
						9388ef66d0
					
				@ -14,7 +14,7 @@ export const getDBPasswordResolver = (db: IDBOption): PasswordResolver => {
 | 
			
		||||
            region: db.awsRegion,
 | 
			
		||||
            hostname: db.host,
 | 
			
		||||
            port: db.port,
 | 
			
		||||
            username: db.user,
 | 
			
		||||
            username: process.env.DATABASE_USERNAME || db.user,
 | 
			
		||||
        });
 | 
			
		||||
        return async () => {
 | 
			
		||||
            console.log('[AWS RDS SIGNER] Getting token...');
 | 
			
		||||
 | 
			
		||||
@ -11,14 +11,18 @@ export function createDb({
 | 
			
		||||
    const logger = getLogger('db-pool.js');
 | 
			
		||||
 | 
			
		||||
    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({
 | 
			
		||||
        client: 'pg',
 | 
			
		||||
        version: db.version,
 | 
			
		||||
        connection: {
 | 
			
		||||
            ...db,
 | 
			
		||||
            user: process.env.DATABASE_USERNAME || db.user,
 | 
			
		||||
            application_name: db.applicationName,
 | 
			
		||||
            password: getDBPasswordResolver(db),
 | 
			
		||||
        },
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user