@redhat-cloud-services/frontend-components-config-utilities 1.5.14 → 1.5.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config-utilities",
-    "version": "1.5.14",
+    "version": "1.5.17",
     "description": "Utilities for shared config used in RedHat Cloud Services project.",
     "main": "index.js",
     "publishConfig": {

package/serve-federated.js

@@ -2,12 +2,12 @@ const path = require('path');
 const fs = require('fs');
 const concurrently = require('concurrently');
 
-async function federate(argv, cwd) {
-  let configPath = argv.config;
+function federate(argv, cwd) {
+  let configPath = argv.config || './node_modules/@redhat-cloud-services/frontend-components-config/src/scripts/prod.webpack.config.js';
   const WEBPACK_PATH = path.resolve(cwd, './node_modules/.bin/webpack');
   const HTTP_SERVER_PATH = path.resolve(cwd, './node_modules/.bin/http-server');
   if (typeof configPath !== 'string') {
-    console.error('Missing webpack config path');
+    console.error('Invalid webpack config path!');
     process.exit(1);
   }
 
@@ -17,15 +17,17 @@ async function federate(argv, cwd) {
     fs.statSync(configPath);
     let config = require(configPath);
     if (typeof config === 'function') {
-      config = await Promise.resolve(config(process.env));
+      config = config(process.env);
     }
 
-    const outputPath = config.output.path;
+    Promise.resolve(config).then((config) => {
+      const outputPath = config.output.path;
 
-    concurrently([
-      `${WEBPACK_PATH} --config ${configPath} --watch --output-path ${path.join(outputPath, config.output.publicPath)}`,
-      `${HTTP_SERVER_PATH} ${outputPath} -p ${argv.port || 8003} -c-1`,
-    ]);
+      concurrently([
+        `${WEBPACK_PATH} --config ${configPath} --watch --output-path ${path.join(outputPath, config.output.publicPath)}`,
+        `${HTTP_SERVER_PATH} ${outputPath} -p ${argv.port || 8003} -c-1`,
+      ]);
+    });
   } catch (error) {
     console.error(error);
     process.exit(1);

package/standalone/services/default/entitlements.js

@@ -19,17 +19,25 @@ module.exports = ({ env }) => ({
         'entitlements-config': `https://github.com/redhatinsights/entitlements-config#${getEntitlementsBranch(env)}`
     },
     register({ app, config }) {
-      app.get('/api/entitlements/v1/services', (_req, res) => {
-          const configPath = path.join(config.entitlements.assets['entitlements-config'], '/configs/bundles.yml');
-          // Use { json: true } in case of duplicate keys
-          const serviceSKUs = yaml.load(fs.readFileSync(configPath, 'utf8'), { json: true });
-          const services = serviceSKUs.map(serviceSKU => serviceSKU.name);
-          // Grant access to all services
-          const entitlements = services.reduce((acc, cur) => {
-              acc[cur] = { is_entitled: true, is_trial: false };
-              return acc;
-          }, {});
-          res.json(entitlements);
-      });
-    }
+        app.get('/api/entitlements/v1/services', (_req, res) => {
+            try {
+                const configPath = path.join(config.entitlements.assets['entitlements-config'], '/configs/stage/bundles.yml');
+
+                // Use { json: true } in case of duplicate keys
+                const outerYaml = yaml.load(fs.readFileSync(configPath, 'utf8'), { json: true });
+                const serviceSKUs = yaml.load(outerYaml.objects[0].data['bundles.yml'], { json: true });
+
+                const services = serviceSKUs.map(serviceSKU => serviceSKU.name);
+                // Grant access to all services
+                const entitlements = services.reduce((acc, cur) => {
+                    acc[cur] = { is_entitled: true, is_trial: false };
+                    return acc;
+                }, {});
+
+                res.json(entitlements);
+            } catch (error) {
+                res.status(500).json({ error });
+            }
+        });
+    },
 });