@leverege/build-tools 2.6.11 → 2.8.0

package/lib/server/overwhelm.js

@@ -271,8 +271,24 @@ ahoy.forEach(dir => {
       });
     }
 
-    valuesOut += `\n${values}`;
-    valuesOut = doReplacements(valuesOut, over); // If we are going to override then we need to convert it to YAML and
+    valuesOut += `\n${values}`; // Augment the default service section of the YAML with settings that
+    // usually come from the top level overwhelm.yaml file.
+    //
+
+    const valuesAll = YAML.load(valuesOut);
+    const valuesSvc = {
+      service: {
+        PROJECT_ID: 'OVH:<PROJECT_ID>',
+        PROJECT_NAME: 'OVH:<PROJECT_NAME>',
+        HOST: 'OVH:<HOST>',
+        INGRESS: 'OVH:<INGRESS>'
+      }
+    };
+    const valuesMerged = YAML.dump(deepmerge(valuesSvc, valuesAll), {
+      quotingType: '"'
+    });
+    valuesOut = doReplacements(valuesMerged, over); // DEPRECATED once siren and manheim are platform 4.0
+    // If we are going to override then we need to convert it to YAML and
     // do a deepmerge to combine the values.
 
     const valuesOverride = `${dir}/values-override.yaml`;
@@ -286,7 +302,8 @@ ahoy.forEach(dir => {
       valuesOut = YAML.dump(deepmerge(allValues, overrides), {
         quotingType: '"'
       });
-    }
+    } // DEPRECATED
+
 
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }

package/lib/server/repo-init/RepoInit.js

@@ -168,6 +168,7 @@ const start = async () => {
     - add / flesh out remaining templates
         - express-server
         - library
+        - molten-ui
         - ui-lib
         - ui-???
 `);

package/lib/web/overwhelm.js

@@ -271,8 +271,24 @@ ahoy.forEach(dir => {
       });
     }
 
-    valuesOut += `\n${values}`;
-    valuesOut = doReplacements(valuesOut, over); // If we are going to override then we need to convert it to YAML and
+    valuesOut += `\n${values}`; // Augment the default service section of the YAML with settings that
+    // usually come from the top level overwhelm.yaml file.
+    //
+
+    const valuesAll = YAML.load(valuesOut);
+    const valuesSvc = {
+      service: {
+        PROJECT_ID: 'OVH:<PROJECT_ID>',
+        PROJECT_NAME: 'OVH:<PROJECT_NAME>',
+        HOST: 'OVH:<HOST>',
+        INGRESS: 'OVH:<INGRESS>'
+      }
+    };
+    const valuesMerged = YAML.dump(deepmerge(valuesSvc, valuesAll), {
+      quotingType: '"'
+    });
+    valuesOut = doReplacements(valuesMerged, over); // DEPRECATED once siren and manheim are platform 4.0
+    // If we are going to override then we need to convert it to YAML and
     // do a deepmerge to combine the values.
 
     const valuesOverride = `${dir}/values-override.yaml`;
@@ -286,7 +302,8 @@ ahoy.forEach(dir => {
       valuesOut = YAML.dump(deepmerge(allValues, overrides), {
         quotingType: '"'
       });
-    }
+    } // DEPRECATED
+
 
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.6.11",
+  "version": "2.8.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "execa": "^5.1.1",
     "figlet": "^1.5.2",
     "git-branch": "^2.0.1",
-    "glob": "^7.1.7",
+    "glob": "^7.2.0",
     "inquirer": "^8.1.5",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
@@ -72,7 +72,7 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.5",
-    "simple-git": "^2.45.1"
+    "simple-git": "^2.46.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.7",
@@ -80,6 +80,6 @@
     "@babel/node": "^7.15.4",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^7.24.0"
+    "npm": "^7.24.1"
   }
 }

package/src/overwhelm.js

@@ -224,8 +224,24 @@ ahoy.forEach( ( dir ) => {
       valuesOut += fs.readFileSync( valuesLocal, { encoding : 'utf-8' } )
     }
     valuesOut += `\n${values}`
-    valuesOut = doReplacements( valuesOut, over )
 
+    // Augment the default service section of the YAML with settings that
+    // usually come from the top level overwhelm.yaml file.
+    //
+    const valuesAll = YAML.load( valuesOut )
+    const valuesSvc = {
+      service : {
+        PROJECT_ID : 'OVH:<PROJECT_ID>',
+        PROJECT_NAME : 'OVH:<PROJECT_NAME>',
+        HOST : 'OVH:<HOST>',
+        INGRESS : 'OVH:<INGRESS>',
+      }
+    }
+    const valuesMerged = YAML.dump( deepmerge( valuesSvc, valuesAll ), { quotingType : '"' } )
+
+    valuesOut = doReplacements( valuesMerged, over )
+
+    // DEPRECATED once siren and manheim are platform 4.0
     // If we are going to override then we need to convert it to YAML and
     // do a deepmerge to combine the values.
     const valuesOverride = `${dir}/values-override.yaml`
@@ -236,6 +252,7 @@ ahoy.forEach( ( dir ) => {
       const allValues = YAML.load( valuesOut )
       valuesOut = YAML.dump( deepmerge( allValues, overrides ), { quotingType : '"' } )
     }
+    // DEPRECATED
 
     fs.writeFileSync( `${dir}/values.yaml`, valuesOut )
   }