Преглед изворни кода

PROD-2707: USE `COMPANY_ID` env variable for URL routes

Blake Schneider пре 5 година
родитељ
комит
45da5094c5
5 измењених фајлова са 7 додато и 4 уклоњено
  1. 2 2
      __tests__/util/provision-ven.js
  2. 1 0
      config/development.js
  3. 1 0
      config/production.js
  4. 1 0
      config/testing.js
  5. 2 2
      server/routes/index.js

+ 2 - 2
__tests__/util/provision-ven.js

@@ -2,7 +2,7 @@
 
 const { API } = require('@hw/edge-sdks');
 const logger = require('../../logger');
-const { company, nantumUrl } = require('../../config');
+const { companyId, company, nantumUrl } = require('../../config');
 const { request } = API({ company, logger });
 
 const { pki } = require('node-forge');
@@ -219,7 +219,7 @@ async function getVenClient() {
   );
 
   const ven = new Ven(
-    `http://127.0.0.1:${port}/${company}`,
+    `http://127.0.0.1:${port}/${companyId}`,
     clientCrtPem,
     commonName,
     fingerprint,

+ 1 - 0
config/development.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   company: process.env.COMPANY,
+  companyId: process.env.COMPANY_ID,
   nantumUrl: process.env.NANTUM_URL,
   noAWS: process.env.NO_AWS,
   loggerOptions: {

+ 1 - 0
config/production.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   company: process.env.COMPANY,
+  companyId: process.env.COMPANY_ID,
   nantumUrl: process.env.NANTUM_URL,
   port: process.env.PORT || 3001,
   loggerOptions: {

+ 1 - 0
config/testing.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   company: process.env.COMPANY || 'test_company',
+  companyId: process.env.COMPANY_ID || 'test_company_id',
   nantumUrl: process.env.NANTUM_URL,
   port: 3002,
   loggerOptions: {

+ 2 - 2
server/routes/index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const { company } = require('../../config');
+const { companyId } = require('../../config');
 
 const router = require('express').Router();
 
-const oadrPrefix = `/${company}/OpenADR2/Simple/2.0b`;
+const oadrPrefix = `/${companyId}/OpenADR2/Simple/2.0b`;
 
 router.use(`${oadrPrefix}/EiRegisterParty`, require('./register-party'));
 router.use(`${oadrPrefix}/EiEvent`, require('./event'));