refactor: keep env fail-fast while making redis optional

Author: Ihor Masechko

website/app.js

@@ -1,9 +1,9 @@
 const apostrophe = require('apostrophe');
 require('dotenv').config({ path: '../.env' });
-const { getEnv, getOptionalEnv } = require('./utils/env');
+const { getEnv } = require('./utils/env');
 
 function createAposConfig() {
-  const redisUri = getOptionalEnv('REDIS_URI');
+  const redisUri = process.env.REDIS_URI;
 
   const sessionConfig = {
     secret: getEnv('SESSION_SECRET'),

website/utils/env.js

@@ -7,15 +7,6 @@ const getEnv = (name) => {
   return value;
 };
 
-const getOptionalEnv = (name, defaultValue) => {
-  const value = process.env[name];
-  if (value === undefined) {
-    return defaultValue;
-  }
-  return value;
-};
-
 module.exports = {
   getEnv,
-  getOptionalEnv,
 };

website/utils/env.test.js

@@ -1,4 +1,4 @@
-const { getEnv, getOptionalEnv } = require('./env');
+const { getEnv } = require('./env');
 
 describe('getEnv utility', () => {
   const OLD_ENV = process.env;
@@ -30,30 +30,3 @@ describe('getEnv utility', () => {
     }).toThrow('Environment variable "NON_EXISTENT_VAR" is not defined');
   });
 });
-
-describe('getOptionalEnv utility', () => {
-  const OLD_ENV = process.env;
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = { ...OLD_ENV };
-  });
-
-  afterAll(() => {
-    process.env = OLD_ENV;
-  });
-
-  test('should return environment variable value when it exists', () => {
-    process.env.OPTIONAL_TEST_VAR = 'optional-test-value';
-
-    const result = getOptionalEnv('OPTIONAL_TEST_VAR');
-
-    expect(result).toBe('optional-test-value');
-  });
-
-  test('should return default value when environment variable does not exist', () => {
-    const result = getOptionalEnv('NON_EXISTENT_OPTIONAL_VAR', 'default');
-
-    expect(result).toBe('default');
-  });
-});