Skip to content

Commit 1835f61

Browse files
committed
fix: change way to get env keys
1 parent e43b01a commit 1835f61

File tree

1 file changed

+9
-26
lines changed

1 file changed

+9
-26
lines changed

src/common/config/env.validation.ts

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Environment, LogLevel, LogFormat } from './interfaces';
66
const toNumber =
77
({ defaultValue }) =>
88
({ value }) => {
9-
if (value === '' || value == null) return defaultValue;
9+
if (value === '' || value == null || value === undefined) return defaultValue;
1010
return Number(value);
1111
};
1212

@@ -18,7 +18,7 @@ export class EnvironmentVariables {
1818
@IsNumber()
1919
@Min(1)
2020
@Transform(toNumber({ defaultValue: 3000 }))
21-
PORT: number;
21+
PORT: number = undefined;
2222

2323
@IsOptional()
2424
@IsString()
@@ -49,16 +49,16 @@ export class EnvironmentVariables {
4949
@IsOptional()
5050
@IsEnum(LogLevel)
5151
@Transform(({ value }) => value || LogLevel.info)
52-
LOG_LEVEL: LogLevel;
52+
LOG_LEVEL: LogLevel = undefined;
5353

5454
@IsOptional()
5555
@IsEnum(LogFormat)
5656
@Transform(({ value }) => value || LogFormat.json)
57-
LOG_FORMAT: LogFormat;
57+
LOG_FORMAT: LogFormat = undefined;
5858

5959
@IsOptional()
6060
@IsString()
61-
JOB_INTERVAL_VALIDATORS;
61+
JOB_INTERVAL_VALIDATORS = undefined;
6262

6363
@IsOptional()
6464
@IsString()
@@ -71,17 +71,18 @@ export class EnvironmentVariables {
7171
@IsArray()
7272
@ArrayMinSize(1)
7373
@Transform(({ value }) => value.split(','))
74-
CL_API_URLS!: string[];
74+
CL_API_URLS: string[] = undefined;
7575

7676
@IsArray()
7777
@ArrayMinSize(1)
7878
@Transform(({ value }) => value.split(','))
79-
EL_RPC_URLS!: string[];
79+
EL_RPC_URLS: string[] = undefined;
8080

8181
@IsNumber()
8282
@Transform(({ value }) => Number(value))
83-
CHAIN_ID!: number;
83+
CHAIN_ID: number = undefined;
8484
}
85+
export const ENV_KEYS = Object.keys(new EnvironmentVariables());
8586

8687
export function validate(config: Record<string, unknown>) {
8788
const validatedConfig = plainToClass(EnvironmentVariables, config);
@@ -96,21 +97,3 @@ export function validate(config: Record<string, unknown>) {
9697

9798
return validatedConfig;
9899
}
99-
100-
export const ENV_KEYS = [
101-
'NODE_ENV',
102-
'PORT',
103-
'CORS_WHITELIST_REGEXP',
104-
'GLOBAL_THROTTLE_TTL',
105-
'GLOBAL_THROTTLE_LIMIT',
106-
'GLOBAL_CACHE_TTL',
107-
'SENTRY_DSN',
108-
'LOG_LEVEL',
109-
'LOG_FORMAT',
110-
'JOB_INTERVAL_VALIDATORS',
111-
'JOB_INTERVAL_QUEUE_INFO',
112-
'JOB_INTERVAL_CONTRACT_CONFIG',
113-
'CL_API_URLS',
114-
'EL_RPC_URLS',
115-
'CHAIN_ID',
116-
];

0 commit comments

Comments
 (0)