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

remove unnecessary testing, fix columns, feedback

Browse Source 
Signed-off-by: lpete@vmware.com <lpete@vmware.com>

fix issues with merge

Signed-off-by: lpete@vmware.com <lpete@vmware.com>
This commit is contained in:
lpete@vmware.com
2023-08-15 10:09:05 -04:00
parent 8f61efaea5
commit a2960b0667
9 changed files with 37 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/e2e-test/package.json
+1 -1
View File
@@ -35,8 +35,8 @@
"cross-fetch": "^3.1.5",
"fs-extra": "10.1.0",
"handlebars": "^4.7.3",
"pgtools": "^1.0.0",
"mysql2": "^2.2.5",
"pgtools": "^1.0.0",
"puppeteer": "^17.0.0",
"tree-kill": "^1.2.2"
},
packages/e2e-test/src/commands/index.ts
+8 -1
View File
@@ -18,5 +18,12 @@ import { Command } from 'commander';
import { run } from './run';
export function registerCommands(program: Command) {
program.command('run').description('Run e2e tests').action(run);
program
.command('run')
.description('Run e2e tests')
.option(
'-db, --dbms',
'Selected database management system for e2e testing, (eg. mysql, postgres)',
)
.action(run);
}
packages/e2e-test/src/commands/run.ts
+15 -26
View File
@@ -46,7 +46,7 @@ const templatePackagePaths = [
'packages/create-app/templates/default-app/packages/backend/package.json.hbs',
];
export async function run() {
export async function run(dbms: string = 'postgres') {
const rootDir = await fs.mkdtemp(resolvePath(os.tmpdir(), 'backstage-e2e-'));
print(`CLI E2E test root: ${rootDir}\n`);
@@ -69,17 +69,15 @@ export async function run() {
print('Starting the app');
await testAppServe(pluginId, appDir);
if (Boolean(process.env.POSTGRES_USER) || Boolean(process.env.MYSQL_USER)) {
if (
Boolean(process.env.POSTGRES_USER) ||
Boolean(process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING)
) {
print('Testing the datbase backend startup');
await preCleanDatabase();
await dropClientDatabases(dbms);
const appConfig = path.resolve(appDir, 'app-config.yaml');
let productionConfig = path.resolve(appDir, 'app-config.production.yaml');
if (Boolean(process.env.MYSQL_HOST)) {
productionConfig = path.resolve(
appDir,
'app-config.production.mysql.yaml',
);
}
const productionConfig = path.resolve(appDir, 'app-config.production.yaml');
await testBackendStart(
appDir,
'--config',
@@ -435,10 +433,10 @@ async function testAppServe(pluginId: string, appDir: string) {
}
}
/** Drops PG databases */
async function dropDB(database: string, client: string) {
/** Drops databases */
async function dropDB(database: string, dbms: string) {
try {
if (client === 'postgres') {
if (dbms === 'postgres') {
const config = {
host: process.env.POSTGRES_HOST ? process.env.POSTGRES_HOST : '',
port: process.env.POSTGRES_PORT ? process.env.POSTGRES_PORT : '',
@@ -448,7 +446,7 @@ async function dropDB(database: string, client: string) {
: '',
};
await pgtools.dropdb(config, database);
} else if (client === 'mysql') {
} else if (dbms === 'mysql') {
const connectionString =
process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING ?? '';
const connection = await mysql.createConnection(connectionString);
@@ -460,18 +458,8 @@ async function dropDB(database: string, client: string) {
}
/** Clean remnants from prior e2e runs */
async function preCleanDatabase() {
async function dropClientDatabases(dbms: string) {
print('Dropping old DBs');
if (Boolean(process.env.POSTGRES_HOST)) {
await dropClientDatabases('postgres');
}
if (Boolean(process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING)) {
await dropClientDatabases('mysql');
}
print('Created DBs');
}
async function dropClientDatabases(client: string) {
await Promise.all(
[
'catalog',
@@ -481,8 +469,9 @@ async function dropClientDatabases(client: string) {
'proxy',
'techdocs',
'search',
].map(name => dropDB(`backstage_plugin_${name}`, client)),
].map(name => dropDB(`backstage_plugin_${name}`, dbms)),
);
print('Created DBs');
}
/**