mirror of
https://github.com/directus/directus.git
synced 2026-04-25 03:00:53 -04:00
Simple parser
This commit is contained in:
@@ -4,7 +4,7 @@ import {
|
||||
IRateLimiterStoreOptions,
|
||||
IRateLimiterOptions,
|
||||
} from 'rate-limiter-flexible';
|
||||
import camelcase from 'camelcase';
|
||||
import parseEnv from './utils/parse-env';
|
||||
import { RedisNotFoundException } from './exceptions';
|
||||
import env from './env';
|
||||
|
||||
@@ -54,10 +54,8 @@ function getRateLimiterRedisConfig(): IRateLimiterStoreOptions {
|
||||
for (const [key, value] of Object.entries(env)) {
|
||||
if (key.startsWith('REDIS')) {
|
||||
// amended as we want the second and third words
|
||||
const configKey = camelcase(
|
||||
key.split('_').filter((_, index) => [0, 0].includes(index) === false)
|
||||
);
|
||||
redisConfig[configKey] = value;
|
||||
|
||||
redisConfig[parseEnv(key, 0)] = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
StorageManagerConfig,
|
||||
Storage,
|
||||
} from '@slynova/flydrive';
|
||||
import camelcase from 'camelcase';
|
||||
import parseEnv from './utils/parse-env';
|
||||
import env from './env';
|
||||
|
||||
import { AmazonWebServicesS3Storage } from '@slynova/flydrive-s3';
|
||||
@@ -33,11 +33,7 @@ function getStorageConfig(): StorageManagerConfig {
|
||||
config.disks[disk].driver = value;
|
||||
continue;
|
||||
}
|
||||
|
||||
const configKey = camelcase(
|
||||
key.split('_').filter((_, index) => [0, 1].includes(index) === false)
|
||||
);
|
||||
config.disks[disk].config[configKey] = value;
|
||||
config.disks[disk].config[parseEnv(key, 1)] = value;
|
||||
}
|
||||
|
||||
return config;
|
||||
|
||||
12
api/src/utils/parse-env.ts
Normal file
12
api/src/utils/parse-env.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
import camelcase from 'camelcase';
|
||||
import env from '../env';
|
||||
|
||||
export default function parseEnv(key: string, splitWord: number) {
|
||||
// splitWord 0 = exclude first word on _
|
||||
|
||||
const config = camelcase(
|
||||
key.split('_').filter((_, index) => [0, splitWord].includes(index) === false)
|
||||
);
|
||||
|
||||
return config;
|
||||
}
|
||||
Reference in New Issue
Block a user