Cleanup

Author: ivov

packages/cli/src/benchmark/lib/agent.ts

@@ -1,13 +1,13 @@
 import axios from 'axios';
-import { BACKEND_BASE_URL, INSTANCE_ONWER_EMAIL, INSTANCE_ONWER_PASSWORD } from './constants';
+import { BACKEND_BASE_URL, INSTANCE_ONWER } from './constants';
 import { ApplicationError } from 'n8n-workflow';
 
 export const agent = axios.create({ baseURL: BACKEND_BASE_URL });
 
 export async function authenticateAgent() {
 	const response = await agent.post('/rest/login', {
-		email: INSTANCE_ONWER_EMAIL,
-		password: INSTANCE_ONWER_PASSWORD,
+		email: INSTANCE_ONWER.EMAIL,
+		password: INSTANCE_ONWER.PASSWORD,
 	});
 
 	const cookies = response.headers['set-cookie'];

packages/cli/src/benchmark/lib/constants.ts

@@ -1,5 +1,10 @@
 export const BACKEND_BASE_URL = 'http://127.0.0.1:5678'; // localhost on GitHub Actions runners refuses connections
 
-export const INSTANCE_ONWER_EMAIL = '[email protected]';
-
-export const INSTANCE_ONWER_PASSWORD = 'password';
+export const INSTANCE_ONWER = {
+	EMAIL: '[email protected]',
+	PASSWORD: 'password',
+	FIRST_NAME: 'John',
+	LAST_NAME: 'Smith',
+	API_KEY:
+		'n8n_api_96a4804143bdeb044802273c93423c33e1582c89a764c645fd6304fd2df19f3b2c73f4b972e28194',
+};

packages/cli/src/benchmark/lib/repositories/user.benchmark-repository.ts

@@ -1,19 +1,18 @@
 import { Service } from 'typedi';
 import { hash } from 'bcryptjs';
 import { UserRepository as ProductionUserRepository } from '@/databases/repositories/user.repository';
-import { INSTANCE_ONWER_EMAIL, INSTANCE_ONWER_PASSWORD } from '../constants';
+import { INSTANCE_ONWER } from '../constants';
 
 @Service()
 export class UserRepository extends ProductionUserRepository {
 	async createInstanceOwner() {
 		const user = this.create({
-			email: INSTANCE_ONWER_EMAIL,
-			password: await hash(INSTANCE_ONWER_PASSWORD, 10),
-			firstName: 'John',
-			lastName: 'Smith',
+			email: INSTANCE_ONWER.EMAIL,
+			password: await hash(INSTANCE_ONWER.PASSWORD, 10),
+			firstName: INSTANCE_ONWER.FIRST_NAME,
+			lastName: INSTANCE_ONWER.LAST_NAME,
 			role: 'global:owner',
-			apiKey:
-				'n8n_api_96a4804143bdeb044802273c93423c33e1582c89a764c645fd6304fd2df19f3b2c73f4b972e28194',
+			apiKey: INSTANCE_ONWER.API_KEY,
 		});
 
 		user.computeIsOwner();

packages/core/src/InstanceSettings.ts

@@ -71,6 +71,7 @@ export class InstanceSettings {
 				errorMessage: `Error parsing n8n-config file "${this.settingsFile}". It does not seem to be valid JSON.`,
 			});
 
+			// @TODO: Remove first two logs in benchmark run
 			if (!inTest) console.info(`User settings loaded from: ${this.settingsFile}`);
 
 			const { encryptionKey, tunnelSubdomain } = settings;