give cf-env module an interface similar to logger

Author: rlindner81

src/feature-toggles.js

@@ -19,7 +19,7 @@ const VError = require("verror");
 const yaml = require("yaml");
 const redis = require("./redis-wrapper");
 const { REDIS_INTEGRATION_MODE } = redis;
-const cfEnv = require("./shared/cf-env");
+const { CfEnv } = require("./shared/cf-env");
 const { Logger } = require("./shared/logger");
 const { HandlerCollection } = require("./shared/handler-collection");
 const { LimitedLazyCache } = require("./shared/cache");
@@ -113,6 +113,7 @@ const SCOPE_PREFERENCE_ORDER_MASKS = [
 ];
 
 const readFileAsync = promisify(readFile);
+const cfEnv = CfEnv.getInstance();
 let logger = new Logger(COMPONENT_NAME);
 
 /**

src/redis-wrapper.js

@@ -8,7 +8,7 @@
 
 const redis = require("redis");
 const VError = require("verror");
-const cfEnv = require("./shared/cf-env");
+const { CfEnv } = require("./shared/cf-env");
 const { Logger } = require("./shared/logger");
 const { HandlerCollection } = require("./shared/handler-collection");
 const { Semaphore } = require("./shared/semaphore");
@@ -25,6 +25,7 @@ const INTEGRATION_MODE = Object.freeze({
 });
 const CF_REDIS_SERVICE_LABEL = "redis-cache";
 
+const cfEnv = CfEnv.getInstance();
 const logger = new Logger(COMPONENT_NAME);
 
 const MODE = Object.freeze({

src/shared/cf-env.js

@@ -62,4 +62,7 @@ class CfEnv {
   }
 }
 
-module.exports = CfEnv.getInstance();
+module.exports = {
+  ENV,
+  CfEnv,
+};

src/shared/logger.js

@@ -2,9 +2,10 @@
 const util = require("util");
 const VError = require("verror");
 
-const cfEnv = require("./cf-env");
+const { CfEnv } = require("./cf-env");
 const { tryRequire } = require("./static");
 const cds = tryRequire("@sap/cds");
+const cfEnv = CfEnv.getInstance();
 
 const ENV = Object.freeze({
   LOG_LEVEL: "BTP_FEATURES_LOG_LEVEL",
@@ -254,6 +255,5 @@ module.exports = {
   ENV,
   LEVEL,
   FORMAT,
-
   Logger,
 };

test/__mocks__/cf-env.js

@@ -1,13 +1,26 @@
 "use strict";
 
-const cfEnv = {
+class CfEnvMock {
   _reset() {
     this.isOnCf = false;
     this.cfApp = {};
     this.cfServices = {};
-    this.cfServiceCredentialsForLabel = jest.fn().mockReturnValue({});
-  },
-};
-cfEnv._reset();
+  }
+
+  constructor() {
+    this._reset();
+  }
+
+  cfServiceCredentialsForLabel = jest.fn().mockReturnValue({});
 
-module.exports = cfEnv;
+  static getInstance() {
+    if (!CfEnvMock.__instance) {
+      CfEnvMock.__instance = new CfEnvMock();
+    }
+    return CfEnvMock.__instance;
+  }
+}
+
+module.exports = {
+  CfEnv: CfEnvMock,
+};

test/feature-toggles.test.js

@@ -21,7 +21,8 @@ jest.mock("fs", () => ({
   access: jest.fn((cb) => cb()),
 }));
 
-const envMock = require("../src/shared/cf-env");
+const { CfEnv } = require("../src/shared/cf-env");
+const envMock = CfEnv.getInstance();
 jest.mock("../src/shared/cf-env", () => require("./__mocks__/cf-env"));
 
 const redisWrapperMock = require("../src/redis-wrapper");

test/redis-wrapper.test.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const envMock = require("../src/shared/cf-env");
+const { CfEnv } = require("../src/shared/cf-env");
+const envMock = CfEnv.getInstance();
 jest.mock("../src/shared/cf-env", () => require("./__mocks__/cf-env"));
 
 const mockMessageHandler = jest.fn();

test/shared/env.test.js test/shared/cf-env.test.jstest/shared/env.test.js renamed to test/shared/cf-env.test.js

@@ -108,7 +108,8 @@ describe("cfenv test", () => {
     backupCfServicesEnv = process.env.VCAP_SERVICES;
     process.env.VCAP_APPLICATION = JSON.stringify(mockCfAppEnv);
     process.env.VCAP_SERVICES = JSON.stringify(mockCfServicesEnv);
-    cfEnv = require("../../src/shared/cf-env");
+    const { CfEnv } = require("../../src/shared/cf-env");
+    cfEnv = CfEnv.getInstance();
   });
 
   afterAll(() => {

test/shared/logger.test.js

@@ -8,7 +8,8 @@ const { ENV, LEVEL, FORMAT, Logger } = require("../../src/shared/logger");
 const redisWrapperMock = require("../../src/redis-wrapper");
 jest.mock("../../src/redis-wrapper", () => require("../__mocks__/redis-wrapper"));
 
-const envMock = require("../../src/shared/cf-env");
+const { CfEnv } = require("../../src/shared/cf-env");
+const envMock = CfEnv.getInstance();
 jest.mock("../../src/shared/cf-env", () => require("../__mocks__/cf-env"));
 
 const { FEATURE, mockConfig, redisKey, redisChannel, refreshMessage } = require("../__common__/mockdata");