@leverege/build-tools 2.7.0 → 2.8.1

package/lib/server/overwhelm.js

@@ -68,8 +68,9 @@ const optionsDefinitions = [
 ];
 const args = cliArgs(optionsDefinitions); // The kubernetes context is equal to the git branch name.
 
-const gitBranch = require('git-branch').sync();
-
+const gitBranch = exec('git rev-parse --abbrev-ref HEAD', {
+  stdio: [undefined]
+}).toString().trim();
 const context = args.context || gitBranch;
 
 if (context === 'master') {
@@ -271,8 +272,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 +303,8 @@ ahoy.forEach(dir => {
       valuesOut = YAML.dump(deepmerge(allValues, overrides), {
         quotingType: '"'
       });
-    }
+    } // DEPRECATED
+
 
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }

package/lib/web/overwhelm.js

@@ -68,8 +68,9 @@ const optionsDefinitions = [
 ];
 const args = cliArgs(optionsDefinitions); // The kubernetes context is equal to the git branch name.
 
-const gitBranch = require('git-branch').sync();
-
+const gitBranch = exec('git rev-parse --abbrev-ref HEAD', {
+  stdio: [undefined]
+}).toString().trim();
 const context = args.context || gitBranch;
 
 if (context === 'master') {
@@ -271,8 +272,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 +303,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.7.0",
+  "version": "2.8.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -60,26 +60,25 @@
     "dotenv": "^10.0.0",
     "execa": "^5.1.1",
     "figlet": "^1.5.2",
-    "git-branch": "^2.0.1",
     "glob": "^7.2.0",
-    "inquirer": "^8.1.5",
+    "inquirer": "^8.2.0",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
     "npm-check-updates": "^11.8.5",
     "npm-registry-fetch": "^11.0.0",
-    "open": "^8.2.1",
+    "open": "^8.3.0",
     "ora": "^5.4.1",
     "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",
-    "@babel/core": "^7.15.5",
-    "@babel/node": "^7.15.4",
+    "@babel/core": "^7.15.8",
+    "@babel/node": "^7.15.8",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^7.24.0"
+    "npm": "^7.24.2"
   }
 }

package/src/overwhelm.js

@@ -28,7 +28,9 @@ const optionsDefinitions = [
 const args = cliArgs( optionsDefinitions )
 
 // The kubernetes context is equal to the git branch name.
-const gitBranch = require( 'git-branch' ).sync()
+const gitBranch = exec(
+  'git rev-parse --abbrev-ref HEAD', { stdio : [ undefined ] }
+).toString().trim()
 
 const context = args.context || gitBranch
 
@@ -224,8 +226,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 +254,7 @@ ahoy.forEach( ( dir ) => {
       const allValues = YAML.load( valuesOut )
       valuesOut = YAML.dump( deepmerge( allValues, overrides ), { quotingType : '"' } )
     }
+    // DEPRECATED
 
     fs.writeFileSync( `${dir}/values.yaml`, valuesOut )
   }