@leverege/build-tools 2.8.11 → 2.8.13

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

@@ -89,10 +89,10 @@ const doVersionChecks = async () => {
     VersionCheck.validate({
       current: process.version,
       // this is the node version
-      minimum: '12.18.0',
-      maximum: '15',
+      minimum: '16.12.0',
+      maximum: '17',
       // must be less than this
-      preferred: '14.15.0'
+      preferred: '16.13.0'
     });
   } catch (err) {
     console.log(err);
@@ -168,7 +168,6 @@ const start = async () => {
     - add / flesh out remaining templates
         - express-server
         - library
-        - molten-ui
         - ui-lib
         - ui-???
 `);

package/lib/server/unleash.js

@@ -8,7 +8,12 @@ const SimpleGit = require('simple-git');
 const git = new SimpleGit();
 
 const getCurrentBranchName = async () => {
-  const branchInfo = await git.branch();
+  const branchInfo = await git.branch(); // first check to see if there are no branches - new repo?
+
+  if (Object.keys(branchInfo.branches).length === 0) {
+    return '';
+  }
+
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
 
@@ -27,6 +32,8 @@ const npmRunner = async script => {
   } catch (err) {
     process.exit(1);
   }
+
+  return undefined;
 };
 
 (async () => {

package/lib/web/unleash.js

@@ -8,7 +8,12 @@ const SimpleGit = require('simple-git');
 const git = new SimpleGit();
 
 const getCurrentBranchName = async () => {
-  const branchInfo = await git.branch();
+  const branchInfo = await git.branch(); // first check to see if there are no branches - new repo?
+
+  if (Object.keys(branchInfo.branches).length === 0) {
+    return '';
+  }
+
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
 
@@ -27,6 +32,8 @@ const npmRunner = async script => {
   } catch (err) {
     process.exit(1);
   }
+
+  return undefined;
 };
 
 (async () => {

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.8.11",
+  "version": "2.8.13",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
+    "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/leverege/build-tools.git"
+  },
   "scripts": {
     "build": "npm run compile",
     "clean": "rm -rf lib",
     "compile": "npm run clean && npm run compile_server && npm run compile_web",
     "compile_server": "NODE_ENV=server babel -d lib/server src/ && npm run repo_init_publisher",
     "compile_web": "NODE_ENV=web babel -d lib/web src/",
-    "licenseCheck": "license-checker --summary --failOn GPL",
-    "npm-check-updates": "npm-check-updates -i",
     "postinstall": "src/npm-scripts/postinstall.js",
     "prepublintOnly": "npm run lint && npm run build",
     "prepublishOnly": "npm run compile",
@@ -64,7 +66,6 @@
     "inquirer": "^8.2.0",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^12.0.5",
     "npm-registry-fetch": "^11.0.0",
     "open": "^8.4.0",
     "ora": "^5.4.1",
@@ -74,11 +75,11 @@
     "simple-git": "^2.48.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.5",
-    "@babel/node": "^7.16.5",
+    "@babel/cli": "^7.16.8",
+    "@babel/core": "^7.16.7",
+    "@babel/node": "^7.16.8",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.3.0"
+    "npm": "^8.3.1"
   }
 }

package/src/anchor

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Load the standard helper functions
+. `build-tools --bashfun`
+
+if [ -z "$1" ] || [ -z "$2" ];
+then
+  cat<<USAGE
+
+  $(color g "Usage: anchor <service name> <chart version>\n")
+
+USAGE
+  exit 1
+fi
+
+SERVICE=$1
+VERSION=$2
+ANCHOR="${SERVICE}/Chart-${VERSION}"
+
+if compgen -G "${SERVICE}/Chart-*" > /dev/null ;
+then
+  cat<<ALREADY_ANCHORED
+
+$(color r "$SERVICE is already anchored")
+$(color y "Go remove the existing anchor from ${SERVICE} and try again")
+
+`/bin/ls ${SERVICE}/Chart*`
+
+ALREADY_ANCHORED
+exit 1
+fi
+
+printf "Locking $SERVICE chart version at $VERSION\n"
+touch ${ANCHOR}
+
+if [ -f "${ANCHOR}" ];
+then
+  printf "Service locked with creation of ${ANCHOR}\n"
+else
+  printf "***ERROR: failed to create anchor ${ANCHOR}\n"
+fi

package/src/dockreate

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

package/src/pkgck

@@ -9,6 +9,10 @@ good() {
   printf "\e[32m✔${C_off}"
 }
 
+meh() {
+  printf "\e[36m✩${C_off}"
+}
+
 bad() {
   printf "\e[31m✘${C_off}"
 }
@@ -31,6 +35,7 @@ check_babel () {
   local C_stat=$(bad)
   [ -f .babelrc ] && grep --silent @leverege/babel-preset-leverege-node .babelrc
   [ $? -eq 0 ] && C_stat=$(good)
+  [ ! -f .babelrc ] && C_stat=$(meh)
   printf $C_stat
 }
 
@@ -48,7 +53,7 @@ check_eslint () {
 }
 
 check_license () {
-  local C_stat=$(bad)
+  local C_stat=$(meh)
   local lic="`node -p \"require('./package.json').scripts.licenseCheck !== undefined\"`"
   [ $lic == true ] && C_stat=$(good)
   printf $C_stat
@@ -93,6 +98,13 @@ check_scope() {
   printf "${result}${C_off}"
 }
 
+check_ESM() {
+  local C_stat=$(bad)
+  jstype="`getjson --file package.json --key type`"
+  [[ "$jstype" == "module" ]] && C_stat=$(good)
+  printf $C_stat
+}
+
 repos=0
 check_repo() {
   local dir=$1
@@ -118,10 +130,11 @@ check_repo() {
   local babel7=$(check_babel)
   local circle=$(check_circle)
   local eslint=$(check_eslint)
+  local esmlib=$(check_ESM)
   local license=$(check_license)
   local scoped=$(check_scope)
-  [ $(( $repos % 15)) -eq 0 ] && printf "\n%35s pkg      git  cln scop cir lic esl bl7\n"
-  printf "%32s: %-8s %-16s %s  %8s  %s   %s   %s   %s  %s\n" $dir $pkgver $(check_git_version $gitver $pkgver) $localmods $scoped $circle $license $eslint $babel7 "$needspush"
+  [ $(( $repos % 15)) -eq 0 ] && printf "\n%35s pkg      git  cln scop cir lic ESM bl7\n"
+  printf "%32s: %-8s %-16s %s  %8s  %s   %s   %s   %s  %s\n" $dir $pkgver $(check_git_version $gitver $pkgver) $localmods $scoped $circle $license $esmlib $babel7 "$needspush"
   let "repos++"
   cd - &> /dev/null
 }

package/src/unleash.js

@@ -2,10 +2,15 @@
 
 const execa = require( 'execa' )
 const SimpleGit = require( 'simple-git' )
+
 const git = new SimpleGit()
 
 const getCurrentBranchName = async () => {
   const branchInfo = await git.branch()
+
+  // first check to see if there are no branches - new repo?
+  if ( Object.keys( branchInfo.branches ).length === 0 ) { return '' }
+
   return Object
     .entries( branchInfo.branches )
     .find( ( [ name, info ] ) => ( info.current ) )[0]
@@ -24,13 +29,14 @@ const npmRunner = async ( script ) => {
   } catch ( err ) {
     process.exit( 1 )
   }
+  return undefined
 }
 
 ( async () => {
   if ( await isProtected() ) {
     const script = [ 'test', 'lint' ]
-    for( let i = 0; i < script.length; i++ ) {
-      await npmRunner( script[ i ] )
+    for ( let i = 0; i < script.length; i++ ) {
+      await npmRunner( script[i] )
     }
   } else {
     process.exit( 0 )

package/src/helm-starters/chart/Chart.yaml

@@ -1,4 +0,0 @@
-name: qmed-qvue-ingestor
-version: 1.4.9
-apiVersion: v2
-icon: https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.svg

package/src/helm-starters/chart/templates/NOTES.txt

@@ -1,52 +0,0 @@
--------------------------------------------------------------------------------
-
-Service: {{ .Chart.Name }}
-
-This service relies on the presence of a Service Account (SA) to define its
-permissions on the clusters that it is deployed to. Verify or create an SA
-with the following name and IAM roles:
-
-   SA name   => {{ .Chart.Name }}
-   IAM roles => pubsub.editor
-                secretmanager.secretAccessor
-
-{{- if .Values.workloadIdentity.disabled }}
-
-Workload Identity is disabled for this service, most likely because this is
-running on a legacy cluster which does not support it. In order for this
-service to function properly a set of JSON keys will need to be generated and
-then stored as a secret using this syntax:
-
-  cat <keyfileName> | kubectl create secret generic {{ .Chart.Name }}-sa-key \
-                                    --from-file=key.json=/dev/stdin
-
-{{- else }}
-
-Workload identity is enabled for this service, therefore the SA must have the
-proper IAM policy bound to it. This can be verified by running:
-
-  $ gcloud iam service-accounts get-iam-policy \
-      --project {{ .Values.config.PROJECT_ID }} \
-      {{ .Chart.Name }}@{{ .Values.config.PROJECT_ID }}.iam.gserviceaccount.com
-
-which should return something resembling:
-
-  bindings:
-  - members:
-    - serviceAccount:{{ .Values.config.PROJECT_ID }}.svc.id.goog[default/<service name>]
-    role: roles/iam.workloadIdentityUser
-  etag: <uuencoded tag>
-  version: 1
-
-If the role of roles/iam.workloadIdentityUser does not appear on the SA then
-run the following command to add it:
-
-  $ gcloud iam service-accounts add-iam-policy-binding \
-      --project {{ .Values.config.PROJECT_ID }} \
-      --role roles/iam.workloadIdentityUser \
-      --member "serviceAccount:{{ .Values.config.PROJECT_ID }}.svc.id.goog[default/{{ .Chart.Name }}]" \
-      {{ .Chart.Name }}@{{ .Values.config.PROJECT_ID }}.iam.gserviceaccount.com
-
-{{- end }}
-
--------------------------------------------------------------------------------

package/src/helm-starters/chart/templates/configmap.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Chart.Name }}-configs
-  labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: "{{ .Chart.Name }}"
-    heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
-data:
-  {{- toYaml .Values.config | nindent 2 }}

package/src/helm-starters/chart/templates/deployment.yaml

@@ -1,103 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    redis-client: "true"
-    app: {{ .Chart.Name }}
-    chart/version: {{ .Chart.Version }}
-    chart/appVersion: {{ .Values.image.VERSION }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Chart.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Chart.Name }}
-        chart/version: {{ .Chart.Version }}
-        chart/appVersion: {{ .Values.image.VERSION }}
-        redis-client: "true"
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        prometheus.io/port: "5111"
-        prometheus.io/scrape: "true"
-        configmap.reloader.stakater.com/reload: "default-configs"
-        iam.roles: |
-          "pubsub.editor"
-          "secretManager.secretAccessor"
-    spec:
-      serviceAccountName: {{ .Chart.Name }}
-      volumes:
-      - name: tmpfs
-        emptyDir: {}
-      {{- if .Values.workloadIdentity.disabled }}
-      - name: google-cloud-key
-        secret:
-          secretName: {{ .Chart.Name }}-sa-key
-      {{- end }}
-      {{- if .Values.preemptible.enabled }}
-      tolerations:
-      - key: "preemptible"
-        operator: "Equal"
-        value: "true"
-        effect: "NoSchedule"
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - preference:
-              matchExpressions:
-              - key: cloud.google.com/gke-preemptible
-                operator: Exists
-            weight: 100
-      {{- end }}
-      containers:
-      - name: {{ .Chart.Name }}
-        imagePullPolicy: IfNotPresent
-        image: gcr.io/leverege-docker-images/{{ .Chart.Name }}:{{ .Values.image.VERSION }}
-        securityContext:
-          readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFs }}
-          runAsNonRoot: true
-          runAsUser: 1000
-          allowPrivilegeEscalation: false
-        {{- if .Values.probes }}{{ if .Values.probes.enabled }}
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: api
-          initialDelaySeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /livenessProbe
-            port: api
-          initialDelaySeconds: 15
-          periodSeconds: 60
-        {{- end }}{{ end }}
-        resources:
-          limits:
-            cpu: "100m"
-            memory: "256Mi"
-#         requests:
-#           cpu: "100m"
-#           memory: "128Mi"
-        ports:
-        {{- if .Values.config.port }}
-        - name: api
-          containerPort: {{ .Values.config.port }}
-          protocol: TCP
-        {{- end }}
-        - name: node-metrics
-          containerPort: 5111
-        volumeMounts:
-        - name: tmpfs
-          mountPath: "/tmp"
-        envFrom: 
-        - configMapRef:
-            name: default-configs
-        - configMapRef:
-            name: {{ .Chart.Name }}-configs
-        env:
-        {{- if .Values.workloadIdentity.disabled }}
-        - name: GOOGLE_APPLICATION_CREDENTIALS
-          value: /var/secrets/google/key.json
-        {{- end }}

package/src/helm-starters/chart/templates/hpa.yaml

@@ -1,12 +0,0 @@
-apiVersion: autoscaling/v1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ .Chart.Name }}
-  minReplicas: {{ .Values.horizontalScaler.minReplicas }}
-  maxReplicas: {{ .Values.horizontalScaler.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ .Values.horizontalScaler.maxCPU }}

package/src/helm-starters/chart/templates/ingress.yaml

@@ -1,17 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    app: {{ .Chart.Name }}
-  annotations:
-#   kubernetes.io/ingress.allow-http: "false"
-    kubernetes.io/ingress.global-static-ip-name: {{ .Chart.Name }}
-spec:
-  tls:
-  - secretName: {{ .Values.ingress.secretName }}
-  defaultBackend:
-    service:
-      name: {{ .Chart.Name }}
-      port:
-        number: {{ .Values.config.port }}

package/src/helm-starters/chart/templates/pdb.yaml

@@ -1,9 +0,0 @@
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  minAvailable: 75%
-  selector:
-    matchLabels:
-      app: app

package/src/helm-starters/chart/templates/service.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  type: NodePort
-  selector:
-    app: {{ .Chart.Name }}
-  ports:
-  - name: {{ .Chart.Name }}
-    protocol: TCP
-    port: {{ .Values.config.port }}
-    targetPort: {{ .Values.config.port }}

package/src/helm-starters/chart/templates/serviceaccount.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  annotations:
-    iam.gke.io/gcp-service-account: {{ .Chart.Name }}@{{ .Values.config.PROJECT_ID }}.iam.gserviceaccount.com
-  name: {{ .Chart.Name }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart/version: {{ .Chart.Version }}
-    chart/appVersion: {{ .Values.image.VERSION }}

package/src/helm-starters/chart/values.yaml

@@ -1,44 +0,0 @@
-image:
-  VERSION: v0.4.4
-
-config:
-  LOG_CONFIG: '{"type":"pino","level":"warn"}'
-  BLUEPRINT_ID: needs-to-be-set
-  NETWORK_ID: needs-to-be-set
-  SYSTEM_ID: needs-to-be-set
-  IMAGINE_URL: needs-to-be-set
-  ALIAS_KEY: needs-to-be-set
-  INGESTION_TOPIC: needs-to-be-set
-  port: 8383
-  logExpressRequests: false
-
-ingress:
-  domain: leverege.net
-  secretName: leverege-net-ssl-2034
-
-preemptible:
-  enabled: true
-
-probes:
-  enabled: true
-
-redisClient:
-  label: true
-
-securityContext:
-  readOnlyRootFs: true
-
-horizontalScaler:
-  minReplicas: 1
-  maxReplicas: 3
-  maxCPU: 75
-
-affinity: {}
-
-nodeSelector: {}
-
-podAnnotations: {}
-
-tolerations: []
-
-workloadIdentity: {}

package/src/sa-tools/imp-sa

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-IMPERSONATE='gcloud config set auth/impersonate_service_account'
-impersonate() {
- sa=$1
- echo "Impersonating $sa"
- $IMPERSONATE $sa
-}
-
-case $1 in
-  terraform)
-    impersonate terraformer@leverege-dev-john.iam.gserviceaccount.com
-    ;;
-  gke)
-    impersonate k8s@project.iam.gserviceaccount.com
-    ;;
-  admin)
-    impersonate admin@other-project.iam.gserviceaccount.com
-    ;;
-  clear)
-    gcloud config unset auth/impersonate_service_account
-    ;;
-  *)
-    echo "Usage: Updates impersonated service account"
-    echo "  imp-sa [gke|admin|clear]"
-esac

package/src/sa-tools/roles/LeveregePubSubAccess.json

@@ -1,13 +0,0 @@
-{
-  "title": "Leverege Pub/Sub Access (rw)",
-  "description": "Read/Write access to the Pub/Sub messaging service",
-  "includedPermissions": [
-    "pubsub.subscriptions.consume",
-    "pubsub.subscriptions.create",
-    "pubsub.topics.attachSubscription",
-    "pubsub.topics.create",
-    "pubsub.topics.list",
-    "pubsub.topics.publish"
-  ],
-  "stage": "BETA"
-}

package/src/sa-tools/roles/LeveregeSecretManagerAccess.json

@@ -1,8 +0,0 @@
-{
-  "title": "Leverege Secret Manager Access (ro)",
-  "description": "Read only access to the Secrets in Secrets Manager",
-  "includedPermissions": [
-    "secretmanager.versions.access"
-  ],
-  "stage": "BETA"
-}

package/src/sa-tools/sh-make-sa

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-SVC_PROJ="leverege-dev-john"
-
-SVC_NAME="terraform"
-SVC_ACCT="${SVC_NAME}@${SVC_PROJ}.iam.gserviceaccount.com"
-
-function countdown() {
-  local SEC=${1}
-  shift
-  local MSG=${@}
-  while [ $SEC -ne 0 ];
-  do
-    printf "\r\033[KWaiting %.d seconds $MSG" $((SEC--))
-    sleep 1
-  done
-}
-
-gcloud config unset auth/impersonate_service_account
-
-gcloud iam service-accounts create ${SVC_NAME} \
-  --project=${SVC_PROJ} --quiet \
-  --description="${SVC_NAME} SA" \
-  --display-name="${SVC_NAME}" &> /dev/null
-
-gcloud projects add-iam-policy-binding ${SVC_PROJ} \
-  --project=${SVC_PROJ} --quiet \
-  --member=serviceAccount:${SVC_ACCT}              \
-  --role=roles/editor &> /dev/null
-
-gcloud projects add-iam-policy-binding ${SVC_PROJ} \
-  --project=${SVC_PROJ} --quiet \
-  --member=serviceAccount:${SVC_ACCT}              \
-  --role=roles/iam.securityAdmin &> /dev/null
-
-gcloud projects add-iam-policy-binding ${SVC_PROJ} \
-  --project=${SVC_PROJ} --quiet \
-  --member=serviceAccount:${SVC_ACCT}              \
-  --role=roles/iam.serviceAccountTokenCreator &> /dev/null
-
-countdown 30 "will delete ${SVC_NAME} service account"
-
-gcloud projects remove-iam-policy-binding ${SVC_PROJ} \
-  --project=${SVC_PROJ} --quiet \
-  --member=serviceAccount:${SVC_ACCT}              \
-  --role=roles/iam.serviceAccountTokenCreator &> /dev/null
-
-gcloud projects remove-iam-policy-binding ${SVC_PROJ} \
-  --project=${SVC_PROJ} --quiet \
-  --member=serviceAccount:${SVC_ACCT}              \
-  --role=roles/iam.securityAdmin &> /dev/null
-
-gcloud projects remove-iam-policy-binding ${SVC_PROJ} \
-  --project=${SVC_PROJ} --quiet \
-  --member=serviceAccount:${SVC_ACCT}              \
-  --role=roles/editor &> /dev/null
-
-gcloud iam service-accounts delete ${SVC_ACCT} --quiet &> /dev/null