@leverege/build-tools 2.35.0-john.1 → 2.35.1

package/lib/server/firebaseDeploy.js

@@ -38,7 +38,11 @@ const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
-const [firebaserc, firebaseJson, git] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), _zx.fs.exists(_zx.path.join(process.cwd(), '.git/HEAD'))]);
+const [firebaserc, firebaseJson, gitBranch] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), (0, _zx.$)`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`.then(({
+  stdout
+}) => {
+  return stdout.split('\n')[0];
+})]);
 if (!firebaserc) {
   console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
@@ -51,18 +55,6 @@ if (!firebaserc || !firebaseJson) {
 const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 }));
-
-// If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed. Examining this file directly
-// is less cumbersome then running an actual git command to fetch the
-// branch name
-let gitBranch;
-if (git) {
-  const gitContent = (await _zx.fs.readFile(_zx.path.join(process.cwd(), '.git/HEAD'), {
-    encoding: 'utf-8'
-  }))?.split('/');
-  gitBranch = gitContent[gitContent?.length - 1]?.trimEnd('\n');
-}
 let maxSiteIdLength = 0;
 const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
   Object.entries(config.hosting).forEach(([siteId, aliases]) => {

package/lib/web/firebaseDeploy.js

@@ -38,7 +38,11 @@ const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
-const [firebaserc, firebaseJson, git] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), _zx.fs.exists(_zx.path.join(process.cwd(), '.git/HEAD'))]);
+const [firebaserc, firebaseJson, gitBranch] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), (0, _zx.$)`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`.then(({
+  stdout
+}) => {
+  return stdout.split('\n')[0];
+})]);
 if (!firebaserc) {
   console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
@@ -51,18 +55,6 @@ if (!firebaserc || !firebaseJson) {
 const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 }));
-
-// If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed. Examining this file directly
-// is less cumbersome then running an actual git command to fetch the
-// branch name
-let gitBranch;
-if (git) {
-  const gitContent = (await _zx.fs.readFile(_zx.path.join(process.cwd(), '.git/HEAD'), {
-    encoding: 'utf-8'
-  }))?.split('/');
-  gitBranch = gitContent[gitContent?.length - 1]?.trimEnd('\n');
-}
 let maxSiteIdLength = 0;
 const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
   Object.entries(config.hosting).forEach(([siteId, aliases]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.35.0-john.1",
+  "version": "2.35.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -57,7 +57,7 @@
     "command-line-usage": "^6.1.3",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.3.1",
-    "enquirer": "^2.3.6",
+    "enquirer": "^2.4.1",
     "execa": "^5.1.1",
     "get-bin-path": "^10.0.0",
     "glob": "^8.1.0",
@@ -75,6 +75,6 @@
     "@babel/core": "^7.22.9",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.8.0"
+    "npm": "^9.8.1"
   }
 }

package/src/bash-funcs

@@ -137,7 +137,7 @@ function postToSlack() {
   local dts="`date +\"%c\"`"
   local slackURL="https://hooks.slack.com/services/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"
   local channel="#dev-ops-helm"
-  local slackmsg="\n--- $running \`$GCP_PROJECT_ID\` => $USER / `node --version` @ $dts\n \`$toPost\`"
+  local slackmsg="\n--- $running by \`$USER\` in \`$GCP_PROJECT_ID\` @ $dts\n \`$toPost\`\n node `node --version` / `build-tools --version` /  helm `helm version --short`\n"
 
   curl -X POST -H 'Content-type: application/json' \
            --data "{\"text\":\"$slackmsg\",\"channel\":\"$channel\"}" \

package/src/firebaseDeploy.mjs

@@ -42,11 +42,14 @@ const EXIT_EVENTS = [ 'SIGINT', 'exit', 'uncaughException', 'unhandledRejection'
 const [
   firebaserc,
   firebaseJson,
-  git
+  gitBranch
 ] = await Promise.all( [
   fs.exists( path.join( process.cwd(), '.firebaserc' ) ),
   fs.exists( path.join( process.cwd(), 'firebase.json' ) ),
-  fs.exists( path.join( process.cwd(), '.git/HEAD' ) )
+  $`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`
+    .then( ( { stdout } ) => {
+      return stdout.split( '\n' )[0]
+    } )
 ] )
 
 if ( !firebaserc ) {
@@ -63,16 +66,6 @@ if ( !firebaserc || !firebaseJson ) {
 
 const firebasercContent = JSON.parse( await fs.readFile( path.join( process.cwd(), '.firebaserc' ), { encoding : 'utf-8' } ) )
 
-// If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed. Examining this file directly
-// is less cumbersome then running an actual git command to fetch the
-// branch name
-let gitBranch
-if ( git ) {
-  const gitContent = ( await fs.readFile( path.join( process.cwd(), '.git/HEAD' ), { encoding : 'utf-8' } ) )?.split( '/' )
-  gitBranch = gitContent[gitContent?.length - 1]?.trimEnd( '\n' )
-}
-
 let maxSiteIdLength = 0
 
 const targets = Object

package/src/helmdn

@@ -94,7 +94,6 @@ function annihilateVelero() {
 function helmDown() {
   local namespace=${2:-default}
   local helmdn="helm uninstall $1 -n $namespace"
-  printf "Gonna=>[$helmdn]\n"
   eval $helmdn
   postToSlack $helmdn
 }
@@ -111,15 +110,15 @@ function doNuking() {
         ;;
 
       "elastic"|"elasticsearch")
-        helm uninstall elasticsearch
+        helmDown elasticsearch
         ;;
 
       "estafette"|"preemptible-killer")
-        helm uninstall -n estafette estafette-gke-preemptible-killer
+        helmDown estafette-gke-preemptible-killer estafette
         ;;
 
       "traefik")
-        helm uninstall -n traefik traefik
+        helmDown traefik traefik
         ;;
 
       "monitoring")
@@ -158,7 +157,6 @@ NOGRESS
 
       *)
         helmDown $SERVICE "default"
-        #helm -n default uninstall $SERVICE
     esac
   done
 }

package/src/helmup

@@ -119,7 +119,7 @@ function bootstrapLocalSetup() {
   then
     mkdir $SERVICE
   else
-    # If the service dir already exists but the nghelmup.plugin file is missing
+    # If the service dir already exists but the helmup.plugin file is missing
     # then this is most likely a legacy setup - for example, an older setup for
     # elasticsearch that only had an es-values.yaml file. Note that we cannot
     # get to this logic if the helmup.plugin file exists so no need to check

package/src/k8scale

@@ -1,22 +1,13 @@
 #!/bin/bash
 
-# Simple ANSI color coded string generator.
-function color() {
-  local color=
-  case "$1" in
-    'g') color="92m" ;; # green
-    'c') color="96m" ;; # lt blue
-    'y') color="93m" ;; # yellow
-    'r') color="91m" ;; # red
-    'toast') color="1;3;7;91;103;5m" ;;
-  esac
-  printf "\e[$color$2\e[0m"
-}
+# Load the standard helper functions
+. `build-tools --bashfun`
 
 GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
 
 overwhelm
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
+GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
 
 REPLICAS=
 DIRECTION=$1 && shift
@@ -40,5 +31,6 @@ do
   kubectl scale --replicas=$REPLICAS deployment $SERVICE &>/dev/null
   [ $? -eq 1 ] && RESULTS="`color r FAILURE`"
   printf "  $RESULTS => $SERVICE\n"
+  postToSlack "k8scale $DIRECTION $SERVICE"
 done
 printf "\n\n"

package/src/circle-lib.yml

@@ -1,150 +0,0 @@
-version: 2.1
-jobs:
-  install:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-npm-deps-{{ checksum "package-lock.json" }}
-            - v1-npm-deps-
-
-      - run:
-          name: Setup @leverege Token
-          command: echo \${NPMRC} > ~/.npmrc
-
-      - run: npm install
-
-      - save_cache:
-          key: v1-npm-deps-{{ checksum "package-lock.json" }}
-          paths:
-            - ./node_modules
-
-      - persist_to_workspace:
-          root: /home/circleci/project
-          paths:
-            - ./node_modules
-
-  security-check:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Check for vulnerabilities
-          command: npm audit --production --audit-level=moderate
-
-  license-check:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Check for LICENSE and README files
-          command: npm run pkglint
-
-      - run:
-          name: Check for license violations (e.g. GPL)
-          command: npx license-checker --production --summary --failOn GPL
-
-  lint:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Lint and save results
-          command: npm run lint-ci
-
-      - store_test_results:
-          path: reports
-
-  docs:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs
-      - store_artifacts:
-          path: docs
-          prefix: docs
-
-  coverage:
-    # coverage runs tests, generates coverage, and saves docs
-    environment:
-      TZ: 'America/New_York'
-    docker:
-      - image: $CIRCLE_NODE_IMG
-      # IF YOU NEED ANY OF THESE, UNCOMMENT TO USE
-      # - image: redis
-      # - image: circleci/mysql:5.7
-      #   environment:
-      #     MYSQL_USER: root
-      #     MYSQL_ROOT_PASSWORD: root
-      #     MYSQL_ALLOW_EMPTY_PASSWORD: true
-      #     MYSQL_HOST: 127.0.0.1
-      # - image: nsqio/nsq
-      #   command: /nsqlookupd -broadcast-address localhost:4160 -tcp-address 0.0.0.0:4160 -http-address 0.0.0.0:4161
-
-      # - image: nsqio/nsq
-      #   command: >
-      #     /nsqd
-      #     -broadcast-address localhost:4150
-      #     -tcp-address 0.0.0.0:4150
-      #     -http-address 0.0.0.0:4151
-      #     -lookupd-tcp-address localhost:4160
-
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-
-      # UNCOMMENT IF YOU NEED DECRYPTING SECRETS
-      # - run:
-      #     name: Load secrets
-      #     command: npm run decrypt
-
-      - run:
-          name: Run Tests and Generate Code Coverage
-          command: npm run coverage
-
-      - run:
-          name: Check if coverage meets at least 70%
-          command: npx c8 check-coverage --functions 70 --lines 70 --statements 70
-
-      - store_artifacts:
-          path: coverage
-          prefix: coverage
-
-workflows:
-  version: 2.1
-  test-build-deploy:
-    jobs:
-      - install:
-          context: npm
-      - security-check:
-          requires:
-            - install
-      - license-check:
-          requires:
-            - install
-      - lint:
-          requires:
-            - install
-      - coverage:
-          requires:
-            - install
-      - docs:
-          requires:
-            - install

package/src/circle-srv.yml

@@ -1,213 +0,0 @@
-version: 2.1
-#orbs:
-#  gcp-gcr: circleci/gcp-gcr@0.6.1
-executors:
-  default:
-    description: >
-      A debian-based machine executor.
-    machine: true
-jobs:
-  install:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-npm-deps-{{ checksum "package-lock.json" }}
-            - v1-npm-deps-
-
-      - run:
-          name: Setup @leverege Token
-          command: echo \${NPMRC} > ~/.npmrc
-
-      - run: npm install
-
-      - save_cache:
-          key: v1-npm-deps-{{ checksum "package-lock.json" }}
-          paths:
-            - ./node_modules
-
-      - persist_to_workspace:
-          root: /home/circleci/project
-          paths:
-            - ./node_modules
-
-  security-check:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Check for vulnerabilities
-          command: npm audit --production --audit-level=moderate
-
-  license-check:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Check for LICENSE and README files
-          command: npm run pkglint
-
-      - run:
-          name: Check for license violations (e.g. GPL)
-          command: npx license-checker --production --summary --failOn GPL
-
-  lint:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Lint and save results
-          command: npm run lint-ci
-
-      - store_test_results:
-          path: reports
-
-  docs:
-    docker:
-      - image: $CIRCLE_NODE_IMG
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs
-      - store_artifacts:
-          path: docs
-          prefix: docs
-
-  coverage:
-    # coverage runs tests, generates coverage, and saves docs
-    environment:
-      TZ: 'America/New_York'
-    docker:
-      - image: $CIRCLE_NODE_IMG
-      # IF YOU NEED ANY OF THESE, UNCOMMENT TO USE
-      # - image: redis
-      # - image: circleci/mysql:5.7
-      #   environment:
-      #     MYSQL_USER: root
-      #     MYSQL_ROOT_PASSWORD: root
-      #     MYSQL_ALLOW_EMPTY_PASSWORD: true
-      #     MYSQL_HOST: 127.0.0.1
-      # - image: nsqio/nsq
-      #   command: /nsqlookupd -broadcast-address localhost:4160 -tcp-address 0.0.0.0:4160 -http-address 0.0.0.0:4161
-
-      # - image: nsqio/nsq
-      #   command: >
-      #     /nsqd
-      #     -broadcast-address localhost:4150
-      #     -tcp-address 0.0.0.0:4150
-      #     -http-address 0.0.0.0:4151
-      #     -lookupd-tcp-address localhost:4160
-
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-
-      # UNCOMMENT IF YOU NEED DECRYPTING SECRETS
-      # - run:
-      #     name: Load secrets
-      #     command: npm run decrypt
-
-      - run:
-          name: Run Tests and Generate Code Coverage
-          command: npm run coverage
-
-      - run:
-          name: Check if coverage meets at least 70%
-          command: npx c8 check-coverage --functions 70 --lines 70 --statements 70
-
-      - store_artifacts:
-          path: coverage
-          prefix: coverage
-
-  build:
-    # build should make dist image and prepare docker file
-    docker:
-      - image: $CIRCLE_NODE_IMG
-
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-
-      - run:
-          name: Setup @leverege Token
-          command: echo \${NPMRC} > ~/.npmrc.ro
-
-      - run:
-          name: Determine version number and container name
-          command: |
-            container="\`node -p \"require('./package.json').leverege.container\"\`"
-            if [ "\$container" == "undefined" ];
-            then
-              container=\$CIRCLE_PROJECT_REPONAME
-            fi
-            NODE_IMAGE="\`node -p \"require('./package.json').leverege.nodeimg\"\`"
-
-            echo \$(git describe --tags) > package_version
-            echo \${container} > container_name
-            echo \${NODE_IMAGE} > node_img
-
-      - run:
-          name: Create Dockerfile and build dist directory
-          command: mkdir -p docker && npm run dockerize \$(git describe --tags)
-
-      - persist_to_workspace:
-          root: ~/project
-          paths:
-            - docker/*
-            - package_version
-            - container_name
-            - node_img
-
-workflows:
-  version: 2.1
-  test-build-deploy:
-    jobs:
-      - install:
-          context: npm
-      - security-check:
-          requires:
-            - install
-      - license-check:
-          requires:
-            - install
-      - lint:
-          requires:
-            - install
-      - coverage:
-          requires:
-            - install
-      - docs:
-          requires:
-            - install
-      - build:
-          context: npm
-          filters:
-            branches:
-              only:
-                - development
-                - /release-.*/
-                - master
-          requires:
-            - install
-            - security-check
-            - license-check
-            - lint
-            - coverage
-            - docs
-

package/src/helm-charts/geotile-server/gitignore

@@ -1 +0,0 @@
-geotile-local.yaml

package/src/helm-charts/geotile-server/helmup.plugin

@@ -1,6 +0,0 @@
-#!/bin/bash
-#
-showInstalling "Geotile Server"
-
-helm upgrade --install geotile-server leverege/geotile-server \
-             --values geotile-server/geotile-values.yaml