paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 15 Packages Projects Releases Wiki Activity

remove unnecessary dbms string, fix ternary

Browse Source 
Signed-off-by: lpete@vmware.com <lpete@vmware.com>
This commit is contained in:
lpete@vmware.com
2023-08-18 15:42:24 -04:00
parent bfa604de33
commit 90c19f86ce
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/e2e-test/src/commands/index.ts
+1 -9
View File
@@ -18,13 +18,5 @@ import { Command } from 'commander';
import { run } from './run';
export function registerCommands(program: Command) {
program
.command('run')
.description('Run e2e tests')
.option(
'-db, --dbms <value>',
'Selected database management system for e2e testing, (eg. mysql, postgres)',
'postgres',
)
.action(run);
program.command('run').description('Run e2e tests').action(run);
}
packages/e2e-test/src/commands/run.ts
+7 -10
View File
@@ -434,17 +434,14 @@ async function dropDB(database: string, client: string) {
try {
if (client === 'postgres') {
const config = {
host: process.env.POSTGRES_HOST ? process.env.POSTGRES_HOST : '',
port: process.env.POSTGRES_PORT ? process.env.POSTGRES_PORT : '',
user: process.env.POSTGRES_USER ? process.env.POSTGRES_USER : '',
password: process.env.POSTGRES_PASSWORD
? process.env.POSTGRES_PASSWORD
: '',
host: process.env.POSTGRES_HOST,
port: process.env.POSTGRES_PORT,
user: process.env.POSTGRES_USER,
password: process.env.POSTGRES_PASSWORD,
};
await pgtools.dropdb(config, database);
} else if (client === 'mysql') {
const connectionString =
process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING ?? '';
const connectionString = process.env.MYSQL_CONNECTION ?? '';
const connection = await mysql.createConnection(connectionString);
await connection.execute('DROP DATABASE ?', [database]);
}
@@ -459,10 +456,10 @@ async function preCleanDatabase() {
if (Boolean(process.env.POSTGRES_HOST)) {
await dropClientDatabases('postgres');
}
if (Boolean(process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING)) {
if (Boolean(process.env.MYSQL_CONNECTION)) {
await dropClientDatabases('mysql');
}
print('Created DBs');
print('Dropped DBs');
}
async function dropClientDatabases(client: string) {