Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-01-13 21:30:30 -05:00
Code Issues Activity

refactor(cloud): clarify the isTest scope (#4310)

Browse source 
clarify the isTest scope
This commit is contained in:
simeng-li 2023-08-10 14:08:13 +08:00 • committed by GitHub
parent 56c8436e19
commit 760e97eee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/core/src/env-set/create-pool.ts
View file

@ -2,9 +2,13 @@ import { assert } from '@silverhand/essentials';
import { createMockPool, createMockQueryResult, createPool, parseDsn } from 'slonik'; import { createMockPool, createMockQueryResult, createPool, parseDsn } from 'slonik';
import { createInterceptors } from 'slonik-interceptor-preset'; import { createInterceptors } from 'slonik-interceptor-preset';
const createPoolByEnv = async (databaseDsn: string, isTest: boolean, poolSize?: number) => { const createPoolByEnv = async (
databaseDsn: string,
mockDatabaseConnection: boolean,
poolSize?: number
) => {
// Database connection is disabled in unit test environment // Database connection is disabled in unit test environment
if (isTest) { if (mockDatabaseConnection) {
return createMockPool({ query: async () => createMockQueryResult([]) }); return createMockPool({ query: async () => createMockQueryResult([]) });
} }

12
packages/core/src/env-set/index.ts
View file

@ -29,15 +29,15 @@ export class EnvSet {
/** The value set for global configurations. */ /** The value set for global configurations. */
static values = new GlobalValues(); static values = new GlobalValues();
static get isTest() {
return this.values.isTest;
}
static get dbUrl() { static get dbUrl() {
return this.values.dbUrl; return this.values.dbUrl;
} }
static sharedPool = createPoolByEnv(this.dbUrl, this.isTest, this.values.databasePoolSize); static sharedPool = createPoolByEnv(
this.dbUrl,
EnvSet.values.isUnitTest,
this.values.databasePoolSize
);
#pool: Optional<DatabasePool>; #pool: Optional<DatabasePool>;
#oidc: Optional<Awaited<ReturnType<typeof loadOidcValues>>>; #oidc: Optional<Awaited<ReturnType<typeof loadOidcValues>>>;
@ -66,7 +66,7 @@ export class EnvSet {
async load() { async load() {
const pool = await createPoolByEnv( const pool = await createPoolByEnv(
this.databaseUrl, this.databaseUrl,
EnvSet.isTest, EnvSet.values.isUnitTest,
EnvSet.values.databasePoolSize EnvSet.values.databasePoolSize
); );

2
packages/shared/src/node/env/GlobalValues.ts vendored
View file

@ -5,8 +5,8 @@ import { throwErrorWithDsnMessage } from './throw-errors.js';
export default class GlobalValues { export default class GlobalValues {
public readonly isProduction = getEnv('NODE_ENV') === 'production'; public readonly isProduction = getEnv('NODE_ENV') === 'production';
public readonly isTest = getEnv('NODE_ENV') === 'test';
public readonly isIntegrationTest = yes(getEnv('INTEGRATION_TEST')); public readonly isIntegrationTest = yes(getEnv('INTEGRATION_TEST'));
public readonly isUnitTest = getEnv('NODE_ENV') === 'test';
public readonly httpsCert = process.env.HTTPS_CERT_PATH; public readonly httpsCert = process.env.HTTPS_CERT_PATH;
public readonly httpsKey = process.env.HTTPS_KEY_PATH; public readonly httpsKey = process.env.HTTPS_KEY_PATH;