@leverege/build-tools 2.20.0-beta.4 → 2.20.0

package/lib/server/npm-scripts/postinstall.js

@@ -8,7 +8,6 @@ const fs = require('fs');
 const untarConfigTarball = async (subdir, tarball) => {
   if (fs.existsSync(subdir)) {
     process.chdir(subdir);
-    await execa('ls');
     await execa('tar', ['xf', tarball]);
   }
 };

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

@@ -162,16 +162,15 @@ const start = async () => {
   await gitter.build(buildSpec);
   console.log(chalk.green.bold`
   Repository setup complete.
-` //     chalk.green.bold`Still to work out:`,
-  //     chalk.yellow`
-  //     - figure out better approach for partial file read on transform
-  //     - add / flesh out remaining templates
-  //         - express-server
-  //         - library
-  //         - ui-lib
-  //         - ui-???
-  // `
-  );
+
+  Still to work out:`, chalk.yellow`
+    - figure out better approach for partial file read on transform
+    - add / flesh out remaining templates
+        - express-server
+        - library
+        - ui-lib
+        - ui-???
+`);
 };
 
 exports.start = start;

package/lib/server/repo-init/gitter/Gitter.js

@@ -75,10 +75,10 @@ class Gitter {
       message: 'Where will the repository be hosted?',
       choices: ['bitbucket', 'github', 'local']
     }, {
-      type: 'input',
+      type: 'list',
       name: 'git.owner',
       message: 'Who is the owner of the git repository?',
-      default: 'leverege',
+      choices: ['leverege', 'cox2m'],
       when: answer => {
         return answer.git.host !== 'local';
       }
@@ -127,16 +127,21 @@ class Gitter {
     const spinner = new Ora();
 
     if (buildSpec.config.npmCheck) {
-      //     console.log( chalk.keyword( 'orange' ).bold( `
-      // Running npm-check-updates interactively to verify all of the package
-      // versions in package.json are up to date prior to committing everything.` ),
-      //     chalk.yellow.bold( `
-      // Pay attention! You may be asked to answer Y/n if any are out of date!` )
-      //     )
-      //     spinner.start( 'Preparing for dependency checks prior to install.' )
-      //     await pause( 3000 )
-      //     spinner.succeed()
-      // setup husky
+      console.log(chalk.keyword('orange').bold(`
+  Running npm-check-updates interactively to verify all of the package
+  versions in package.json are up to date prior to committing everything.`), chalk.yellow.bold(`
+
+  Pay attention! You may be asked to answer Y/n if any are out of date!`));
+      spinner.start('Preparing for dependency checks prior to install.');
+      await pause(3000);
+      spinner.succeed();
+      await execa('npm', ['install', 'npm-check-updates'], {
+        stdio: 'inherit'
+      });
+      await execa('npm', ['run', 'npm-check-updates'], {
+        stdio: 'inherit'
+      }); // setup husky
+
       await execa('npm', ['install', 'husky', '--save-dev'], {
         stdio: 'inherit'
       });

package/lib/server/repo-init/templates/Templates.js

@@ -53,7 +53,7 @@ class Templates {
   }
 
   needsAnIngestionPort(template) {
-    return template.type === 'ingestor' && template.subType !== 'PubSub' && template.subType !== 'HTTP';
+    return template.type === 'ingestor' && template.subType !== 'PubSub';
   }
 
   async runInquiry(spec) {
@@ -112,17 +112,16 @@ class Templates {
       },
     },
     */
-    // {
-    //   type : 'confirm',
-    //   name : 'template.helmify',
-    //   message : 'Run helmify to generate Helm Charts?',
-    //   default : false,
-    //   when : ( answers ) => {
-    //     const template = this.lookupTemplateByType( answers.template.type )
-    //     return typeof template.helm !== 'undefined'
-    //   },
-    // },
     {
+      type: 'confirm',
+      name: 'template.helmify',
+      message: 'Run helmify to generate Helm Charts?',
+      default: true,
+      when: answers => {
+        const template = this.lookupTemplateByType(answers.template.type);
+        return typeof template.helm !== 'undefined';
+      }
+    }, {
       type: 'list',
       name: 'dotenv.logConfig',
       message: 'Your preferred logging method (.env)?',

package/lib/web/npm-scripts/postinstall.js

@@ -8,7 +8,6 @@ const fs = require('fs');
 const untarConfigTarball = async (subdir, tarball) => {
   if (fs.existsSync(subdir)) {
     process.chdir(subdir);
-    await execa('ls');
     await execa('tar', ['xf', tarball]);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.20.0-beta.4",
+  "version": "2.20.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -64,7 +64,7 @@
     "inquirer": "^8.2.4",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
-    "npm-registry-fetch": "^13.3.0",
+    "npm-registry-fetch": "^13.3.1",
     "open": "^8.4.0",
     "ora": "^5.4.1",
     "parse-gitignore": "^2.0.0",
@@ -79,6 +79,6 @@
     "@babel/node": "^7.18.10",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.17.0"
+    "npm": "^8.18.0"
   }
 }

package/src/helmup

@@ -1,7 +1,3 @@
-#!/bin/bash
-#
-# This script is used to ease the pain of transition testing to chart museum
-# for adding / updating deployments on a fluster.
 #
 # printf "\n***** RUNNING LOCALLY *****\n" && sleep 2
 
@@ -161,32 +157,18 @@ function installGrafana() {
 function installRedis() {
   showInstalling "Redis Network Cache"
   addBitnamiRepo latest
-  [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="16" # latest breaks us => "v14+"
+  [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="17" # latest chart 17 is redis v7
   helm upgrade --install redis bitnami/redis \
     --version $REDIS_HELM_CHART \
     -f - <<REDIS_CHART_MODS
-auth:
-  enabled: false
-
 global:
   storageClass: ssd
 
-metrics:
-  enabled: true
-
-networkPolicy:
-  enabled: true
+auth:
+  enabled: false
+  sentinel: false
 
 master:
-  persistence:
-    size: 8Gi # 8Gi is default
-
-  tolerations:
-  - key: "database"
-    operator: "Equal"
-    value: "true"
-    effect: "NoSchedule"
-
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -197,25 +179,29 @@ master:
             values:
             - database
 
-replica:
-  persistence:
-    size: 8Gi # 8Gi is default
-
   tolerations:
   - key: "database"
     operator: "Equal"
     value: "true"
     effect: "NoSchedule"
 
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: target-env
-            operator: In
-            values:
-            - database
+  persistence:
+    size: 8Gi # 8Gi is default
+
+sentinel:
+  enabled: true
+
+networkPolicy:
+  enabled: true
+  allowExternal: false
+  ingressNSMatchLabels:
+    redis: external
+  ingressNSPodMatchLabels:
+    redis-client: true
+
+metrics:
+  enabled: true
+
 REDIS_CHART_MODS
   if [[ $? -ne 0 ]];
   then

package/src/npm-scripts/postinstall.js

@@ -6,12 +6,11 @@ const fs = require( 'fs' )
 const untarConfigTarball = async ( subdir, tarball ) => {
   if ( fs.existsSync( subdir ) ) {
     process.chdir( subdir )
-    await execa( 'ls' )
     await execa( 'tar', [ 'xf', tarball ] )
   }
 }
 
-const awaiter = async ( subdir, tarball ) => {
+const awaiter = async ( subdir, tarball) => {
   await untarConfigTarball( subdir, tarball )
 }