@leverege/build-tools 2.8.2 → 2.8.4

package/lib/server/overwhelm.js

@@ -177,10 +177,15 @@ const yams = glob.sync('values-*.yaml'); // A function to apply the replacements
 // will error out if it runs into an unknown OVH<tag>.
 
 const doReplacements = (yamls, replacements) => {
-  let replYaml = yamls;
+  let replYaml = yamls; // wrap special chars with quotes if needed, like "#---incident-alerts---"
+
+  const quoteSpecials = raw => {
+    return /[#$?*]/g.test(raw) ? `"${raw}"` : raw;
+  };
+
   Object.keys(replacements).forEach(repl => {
     const replaceThis = new RegExp(`OVH:<${repl}>`, 'g');
-    const withThat = `${replacements[repl]}`;
+    const withThat = quoteSpecials(`${replacements[repl]}`);
     replYaml = replYaml.replace(replaceThis, withThat);
   }); // Verify all replaceables have been handled, or error out.
 

package/lib/web/overwhelm.js

@@ -177,10 +177,15 @@ const yams = glob.sync('values-*.yaml'); // A function to apply the replacements
 // will error out if it runs into an unknown OVH<tag>.
 
 const doReplacements = (yamls, replacements) => {
-  let replYaml = yamls;
+  let replYaml = yamls; // wrap special chars with quotes if needed, like "#---incident-alerts---"
+
+  const quoteSpecials = raw => {
+    return /[#$?*]/g.test(raw) ? `"${raw}"` : raw;
+  };
+
   Object.keys(replacements).forEach(repl => {
     const replaceThis = new RegExp(`OVH:<${repl}>`, 'g');
-    const withThat = `${replacements[repl]}`;
+    const withThat = quoteSpecials(`${replacements[repl]}`);
     replYaml = replYaml.replace(replaceThis, withThat);
   }); // Verify all replaceables have been handled, or error out.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/dockreate

@@ -76,7 +76,7 @@ ENV GRPC_VERBOSITY ERROR
 COPY ./.npmrc /usr/src/app/.npmrc
 RUN apk --no-cache add openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
-      libstdc++ linux-headers make python ${apkadds} && \
+      libstdc++ linux-headers make ${apkadds} && \
     npm install -g npm@7 && \
     npm ci --only-production --ignore-scripts ${npmlogging} && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*

package/src/overwhelm.js

@@ -96,6 +96,7 @@ Object.keys( cfgs ).forEach( ( key ) => { over[key] = cfgs[key] || over[key] } )
 //     PROJECT_ID   : prod-rt-data
 //
 const varErrors = []
+
 Object.keys( over ).forEach( ( key ) => {
   if ( !over[key] ) return // no value to work with - skip it
 
@@ -134,9 +135,14 @@ const yams = glob.sync( 'values-*.yaml' )
 const doReplacements = ( yamls, replacements ) => {
   let replYaml = yamls
 
+  // wrap special chars with quotes if needed, like "#---incident-alerts---"
+  const quoteSpecials = ( raw ) => {
+    return /[#$?*]/g.test( raw ) ? `"${raw}"` : raw
+  }
+
   Object.keys( replacements ).forEach( ( repl ) => {
     const replaceThis = new RegExp( `OVH:<${repl}>`, 'g' )
-    const withThat = `${replacements[repl]}`
+    const withThat = quoteSpecials( `${replacements[repl]}` )
     replYaml = replYaml.replace( replaceThis, withThat )
   } )