@redhat-cloud-services/frontend-components-config-utilities 1.4.12 → 1.4.16

package/README.md

@@ -7,6 +7,7 @@
     - [Disable chrome 2](#disable-chrome-2)
   - [Chunk mapper](#chunk-mapper)
   - [Federated modules](#federated-modules)
+  - [Override container ports](#Override container ports)
     - [List of shared deps](#list-of-shared-deps)
 
 ## Chrome render loader
@@ -95,6 +96,15 @@ We've aimed for easy plug and play, but feel free to override any fed mods parti
 * `useFileHash` - in order to prevent caching we are using file hashes, you might want to turn this off in your dev env
 * `exclude` - if you want to exclude any shared module you can do it trough here (even for general dependencies added by us)
 
+### Override container ports
+The default ports for the RBAC server(**4012**) and/or the Keycloak server(**4001**) can be overridden using a corresponding variable in the environment. 
+
+  Bash examples:
+
+      export KEYCLOAK_PORT=4020
+      export RBAC_PORT=5000
+
+
 #### List of shared deps
 
 This packages exposes these federated shared dependencies

package/federated-modules.js

@@ -8,6 +8,7 @@ const include = {
     '@patternfly/react-table': {},
     '@patternfly/react-tokens': {},
     '@patternfly/react-icons': {},
+    '@patternfly/quickstarts': { singleton: true },
     '@redhat-cloud-services/frontend-components': {},
     '@redhat-cloud-services/frontend-components-utilities': {},
     '@redhat-cloud-services/frontend-components-notifications': {},

package/package.json

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

package/proxy.js

@@ -30,6 +30,7 @@ module.exports = ({
     proxyVerbose,
     useCloud = false,
     target = '',
+    keycloakUri = '',
     registry = []
 }) => {
     const proxy = [];
@@ -83,8 +84,7 @@ module.exports = ({
                     ws: true,
                     onProxyReq: cookieTransform,
                     ...(currTarget === 'PORTAL_BACKEND_MARKER' && { router }),
-                    ...typeof redirect === 'object' ? redirect : {},
-                    ...(agent && { agent })
+                    ...typeof redirect === 'object' ? redirect : {}
                 };
             })
         );
@@ -209,11 +209,14 @@ module.exports = ({
                 console.log('\u001b[0m');
             }
         },
-        before(app, server, compiler) {
+        onBeforeSetupMiddleware({ app, compiler, options }) {
             app.enable('strict routing'); // trailing slashes are mean
             let chromePath = localChrome;
             if (standaloneConfig) {
-                chromePath = resolvePath(reposDir, standaloneConfig.chrome.path);
+                if (standaloneConfig.chrome) {
+                    chromePath = resolvePath(reposDir, standaloneConfig.chrome.path);
+                    keycloakUri = standaloneConfig.chrome.keycloakUri;
+                }
             } else if (!localChrome && useProxy) {
                 if (typeof defaultServices.chrome === 'function') {
                     defaultServices.chrome = defaultServices.chrome({});
@@ -230,15 +233,15 @@ module.exports = ({
                 registerChrome({
                     app,
                     chromePath,
-                    keycloakUri: (standaloneConfig && standaloneConfig.chrome) ? standaloneConfig.chrome.keycloakUri : null,
-                    https: Boolean(server.options.https),
+                    keycloakUri,
+                    https: Boolean(options.https),
                     proxyVerbose
                 });
             }
 
             registry.forEach(cb => cb({
                 app,
-                server,
+                options,
                 compiler,
                 config: standaloneConfig
             }));

package/standalone/services/default/chrome.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const glob = require('glob');
 
-const keycloakPort = 4001;
+const keycloakPort = process.env['KEYCLOAK_PORT'] ? process.env['KEYCLOAK_PORT'] : 4001;
 
 module.exports = ({ port }) => ({
     // Chrome handles its auth through keycloak
@@ -114,7 +114,7 @@ module.exports.registerChrome = ({ app, chromePath, keycloakUri, https, proxyVer
                     console.log('inject keycloak',  req.url);
                 }
                 fileString = fileString
-                  .replace(/http:\/\/sso.qa.redhat.com/gm, keycloakUri);
+                  .replace(/https?:\/\/sso.qa.redhat.com/gm, keycloakUri);
             }
             res.end(fileString);
         } else {

package/standalone/services/rbac.js

@@ -11,7 +11,7 @@ function getRbacConfigFolder(env) {
     return 'ci';
 }
 
-const rbacPort = 4012;
+const rbacPort = process.env['RBAC_PORT'] ? process.env['RBAC_PORT'] : 4012;
 
 const services = ({ port, env, assets }) => ({
     redis: {