@leverege/build-tools 1.12.5 → 1.12.7

package/lib/server/circleate

@@ -375,7 +375,7 @@ jobs:
 
       - run:
           name: Check if coverage meets at least 70%
-          command: ./node_modules/.bin/nyc check-coverage --branches 70 --functions 70 --lines 70 --statements 70
+          command: ./node_modules/.bin/nyc check-coverage --functions 70 --lines 70 --statements 70
 
       - run: 
           name: Generate docs

package/lib/server/dockreate

@@ -38,7 +38,7 @@ strip_undefined() {
 }
 
 # Useful links with information regarding k8s/docker/nodejs and PID 1
-#   No PID 1 for NodeJS     => https://bit.ly/2Txi9Jq
+#   No PID 1 for NodeJS     => https://bit.ly/2r4gHkZ
 #   What tini is all about  => https://bit.ly/2HsSxqP
 #   Graceful kills with k8s => https://bit.ly/2NONEJG
 #
@@ -104,7 +104,6 @@ create_bashrc() {
 #
 # Version $1 @ `date`
 
-alias golog='cd /var/log/levlog;ls -l'
 alias h=history
 
 alias ls='ls -CF --color=auto'
@@ -113,18 +112,15 @@ alias lla='ls -lha'
 alias ltr='ls -CF --color=auto -lthr'
 alias genv='env | grep -i'
 alias glep='grep -l -s'
-alias golog='cd /var/log/levlog'
 alias m=less
 alias menv='env | sort | less'
 
 alias whatsmyip='wget -qO- ifconfig.co'
 
-alias rcli='redis-cli -h \${DATABASES_REDIS_SERVICE_HOST}'
-
-alias buny='/usr/src/app/node_modules/bunyan/bin/bunyan'
-alias bunlog='golog;cat *-1.log | buny | m'
 alias dbg='wget -q -O- localhost:5111/logLevel/debug'
 alias inf='wget -q -O- localhost:5111/logLevel/info'
+alias err='wget -q -O- localhost:5111/logLevel/error'
+alias wrn='wget -q -O- localhost:5111/logLevel/warn'
 
 loglev()
 {
@@ -136,7 +132,7 @@ loglev()
     logl="logLevel/\$1"
   fi
 
-  printf "Running=> \$wget/\$logl\n"
+  printf "Running=> \$wget/\${logl}\n"
   printf "\n\`\$wget/\$logl\`\n\n"
 }
 EOBASHRC

package/lib/server/helmify

@@ -53,32 +53,6 @@ spec:
 SVC_YAML
 }
 
-createIngress(){
-  cat<<INGRESS_YAML > ingress.yaml
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: $chartname-ingress
-  annotations:
-    kubernetes.io/ingress.global-static-ip-name: $chartname-ingress
-spec:
-  tls:
-  - secretName: frontendtls
-  rules:
-  - host: {{ quote .Values.$chartname_go.INGRESS_HOST }}
-    http:
-      paths:
-      - backend:
-          serviceName: $chartname
-          servicePort: {{ .Values.$chartname_go.SERVER_PORT }}
-  - http:
-      paths:
-      - backend:
-          serviceName: $chartname
-          servicePort: {{ .Values.$chartname_go.SERVER_PORT }}
-INGRESS_YAML
-}
-
 # Make chart directory
 mkdir helm
 mkdir helm/templates
@@ -90,13 +64,17 @@ PACKAGE_VERSION=$(node -p "require('../package.json').version")
 
 cat<<CHARTYAML > Chart.yaml
 name: $chartname
-version: 1.0.0
-appVersion: $PACKAGE_VERSION
+version: 1.0.0 # version of the Helm Chart 
+appVersion: $PACKAGE_VERSION # minimum version of your application that is compatible with this chart
 
 CHARTYAML
 
 # Bootstrap values.yaml
 cat<<VALUESYAML > values.yaml
+### These are default env variable values for your application
+### It is not actually used in production, but listed here for others as reference for what types of env variables are required. 
+### Overwrite these values in values-local or respective values files in platform-k8s
+
 # List your env variables here
 $chartname_go:
   VERSION: vX.Y.Z
@@ -104,8 +82,6 @@ $chartname_go:
   IMAGE: gcr.io/leverege-docker-images/$chartname
 
 default:
-  LOG_DIR: "/var/log/levlog"
-  LOG_LEVEL: "info"
   MAX_CHILD_PROCESSES: "1"
 
   MODEL_FIREBASE_SERVICE_ACCOUNT: /var/config/keys/model-data
@@ -132,12 +108,7 @@ default:
     \"name\": \"${logName}\",
     \"level\": \"info\",
     \"streams\": [
-      {
-        \"type\": \"rotating-file\",
-        \"period\": \"1d\",
-        \"count\": 3,
-        \"path\": \"/var/log/levlog/${logName}.log\"
-      }, { 
+      { 
         \"type\": \"stackdriver\",
         \"logName\": \"${logName}\"
       } 
@@ -172,13 +143,14 @@ cat<<DEPLOYMENT_YAML > deployment.yaml
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
-  name: $chartname
+  name: {{ .Chart.Name }}
 spec:
   template:
     metadata:
       labels:
-        app: $chartname
-        redis-client: 'true'
+        app: {{ .Chart.Name }}
+        chart/version: {{ .Chart.Version }}
+        chart/appVersion: {{ .Chart.AppVersion }}
       annotations:
         prometheus.io/port: '5111'
         prometheus.io/scrape: 'true'
@@ -187,7 +159,7 @@ spec:
       - name: model-firebase-key
         secret:
           secretName: model-data
-      - name: logs
+      - name: tmpfs
         emptyDir: {}
       - name: pubsub-key
         secret:
@@ -208,7 +180,7 @@ spec:
                 - key: app
                   operator: In
                   values:
-                  - api-server
+                  - {{ .Chart.Name }}
               topologyKey: kubernetes.io/hostname
         nodeAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -219,15 +191,26 @@ spec:
             weight: 50
 {{- end }}
       containers:
-      - name: $chartname
-        image: gcr.io/leverege-docker-images/$chartname:{{ .Values.$chartname_go.VERSION }}
+      - name: {{ .Chart.Name }}
+        image: {{ .Values.$chartname_go.IMAGE }}:{{ .Values.$chartname_go.VERSION }}
         imagePullPolicy: Always
         securityContext:
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
           runAsUser: 1000
           allowPrivilegeEscalation: false
+        readinessProbe:
+          httpGet:
+            path: /
+            port: node-metrics
+          initialDelaySeconds: 10
         resources:
           requests:
-            cpu: "10m"
+            cpu: "50m"
+            memory: "256Mi"
+          limits:
+            cpu: "100m"
+            memory: "512Mi"
         ports:
 {{- if .Values.$chartname_go.SERVER_PORT }}
         - name: api
@@ -238,8 +221,8 @@ spec:
         volumeMounts:
         - name: model-firebase-key
           mountPath: {{ quote .Values.default.MODEL_FIREBASE_SERVICE_ACCOUNT }}
-        - name: logs
-          mountPath: {{ quote .Values.default.LOG_DIR }}
+        - name: tmpfs
+          mountPath: "/tmp"
         - name: pubsub-key
           mountPath: {{ quote .Values.default.PUBSUB_SERVICE_ACCOUNT }}
         env:
@@ -251,10 +234,6 @@ spec:
           value: {{ required "Limit config required" .Values.default.LIMIT_CONFIG | quote }}
         - name: TRANSPORT_CONFIG
           value: {{ required "Transport config required" .Values.default.TRANSPORT_CONFIG | quote }}
-        - name: LOG_DIR
-          value: {{ quote .Values.default.LOG_DIR }}
-        - name: LOG_LEVEL
-          value: {{ quote .Values.default.LOG_LEVEL }}
         - name: LOG_CONFIG
           value: {{ required "Log config required" .Values.default.LOG_CONFIG | quote }}
         - name: MAX_CHILD_PROCESSES
@@ -270,11 +249,11 @@ echo    # (optional) move to a new line
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
   echo
-  echo '**************************************'
-  echo 'CREATING SERVICE AND INGRESS TEMPLATES'
-  echo '**************************************'
+  echo '**********************************'
+  echo '    CREATING SERVICE TEMPLATES    '
+  echo '**********************************'
   createService
-  createIngress
+
 fi
 
 # Print out some hints
@@ -284,11 +263,12 @@ cat<<HINTS
 
   1. You will need to add in additional env variables to both templates/*.yaml and values.yaml
   2. You may not need all the default env variables so feel free to remove them as well
-  3. To use ingress, you need to reserve static ip as specified in ingress.yaml
+  3. Adjust limit/request cpu and memory values as needed
+  4. To use ingress, you need to reserve static ip then add to ingress templates in platform-k8s
 
   	Further instructions here: https://github.com/kelseyhightower/ingress-with-static-ip
 
-  4. Finally, follow chart museum directions to add your chart or
+  5. Finally, follow chart museum directions to add your chart ors
 
   	helm push helm/ chartmuseum
 

package/lib/server/helmup

@@ -355,10 +355,13 @@ function doInstall() {
         fi
         HELMUP="helm upgrade --install $SERVICE chartmuseum/$MUSEUM -f $SERVICE/values.yaml $CHARTVER"
         printf "Helming => `color g \"$HELMUP\"`\n" && $HELMUP
-        if [ $? -ne 0 ];
+        SAVERR=$?
+        if [ $SAVERR -ne 0 ];
         then
           cat<<NOTRUNNING
 
+$RED_ERROR helm exited with error status: $SAVERR
+
 $RED_ERROR The $SERVICE chart failed to upgrade or install. There may be an
            issue with the service's helm charts, or chartmuseum may not be
            up and running? If the latter, try firing it up with:

package/lib/web/dnsify/CloudflareAPI.js

@@ -6,8 +6,6 @@ require("core-js/modules/es6.symbol");
 
 require("core-js/modules/web.dom.iterable");
 
-require("core-js/modules/es6.promise");
-
 require("core-js/modules/es6.regexp.to-string");
 
 require("core-js/modules/es6.object.to-string");
@@ -22,10 +20,6 @@ function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) ||
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -64,80 +58,71 @@ function () {
 
   _createClass(CloudflareAPI, [{
     key: "decrypt",
-    value: function () {
-      var _decrypt = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee() {
-        var projectId,
-            keyRingId,
-            cryptoKeyId,
-            ciphertextFileName,
-            plaintextFileName,
-            kms,
-            client,
-            locationId,
-            readFile,
-            contentsBuffer,
-            name,
-            ciphertext,
-            _ref,
-            _ref2,
-            result,
-            writeFile,
-            _args = arguments;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                projectId = _args.length > 0 && _args[0] !== undefined ? _args[0] : 'leverege-docker-images';
-                keyRingId = _args.length > 1 && _args[1] !== undefined ? _args[1] : 'build-tools';
-                cryptoKeyId = _args.length > 2 && _args[2] !== undefined ? _args[2] : 'circle-ci';
-                ciphertextFileName = _args.length > 3 && _args[3] !== undefined ? _args[3] : './accounts.json.enc';
-                plaintextFileName = _args.length > 4 && _args[4] !== undefined ? _args[4] : './accounts.json';
-                // Import the library and create a client
-                kms = require('@google-cloud/kms');
-                client = new kms.KeyManagementServiceClient(); // The location of the crypto key's key ring, e.g. "global"
-
-                locationId = 'us-east4'; // Reads the file to be decrypted
-
-                readFile = promisify(fs.readFile);
-                _context.next = 11;
-                return readFile(path.resolve(__dirname, ciphertextFileName));
-
-              case 11:
-                contentsBuffer = _context.sent;
-                name = client.cryptoKeyPath(projectId, locationId, keyRingId, cryptoKeyId);
-                ciphertext = contentsBuffer.toString('base64'); // Decrypts the file using the specified crypto key
-
-                _context.next = 16;
-                return client.decrypt({
-                  name: name,
-                  ciphertext: ciphertext
-                });
-
-              case 16:
-                _ref = _context.sent;
-                _ref2 = _slicedToArray(_ref, 1);
-                result = _ref2[0];
-                writeFile = promisify(fs.writeFile);
-                _context.next = 22;
-                return writeFile(path.resolve(__dirname, plaintextFileName), Buffer.from(result.plaintext, 'base64'));
-
-              case 22:
-              case "end":
-                return _context.stop();
-            }
+    value: function decrypt() {
+      var projectId,
+          keyRingId,
+          cryptoKeyId,
+          ciphertextFileName,
+          plaintextFileName,
+          kms,
+          client,
+          locationId,
+          readFile,
+          contentsBuffer,
+          name,
+          ciphertext,
+          _ref,
+          _ref2,
+          result,
+          writeFile,
+          _args = arguments;
+
+      return regeneratorRuntime.async(function decrypt$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              projectId = _args.length > 0 && _args[0] !== undefined ? _args[0] : 'leverege-docker-images';
+              keyRingId = _args.length > 1 && _args[1] !== undefined ? _args[1] : 'build-tools';
+              cryptoKeyId = _args.length > 2 && _args[2] !== undefined ? _args[2] : 'circle-ci';
+              ciphertextFileName = _args.length > 3 && _args[3] !== undefined ? _args[3] : './accounts.json.enc';
+              plaintextFileName = _args.length > 4 && _args[4] !== undefined ? _args[4] : './accounts.json';
+              // Import the library and create a client
+              kms = require('@google-cloud/kms');
+              client = new kms.KeyManagementServiceClient(); // The location of the crypto key's key ring, e.g. "global"
+
+              locationId = 'us-east4'; // Reads the file to be decrypted
+
+              readFile = promisify(fs.readFile);
+              _context.next = 11;
+              return regeneratorRuntime.awrap(readFile(path.resolve(__dirname, ciphertextFileName)));
+
+            case 11:
+              contentsBuffer = _context.sent;
+              name = client.cryptoKeyPath(projectId, locationId, keyRingId, cryptoKeyId);
+              ciphertext = contentsBuffer.toString('base64'); // Decrypts the file using the specified crypto key
+
+              _context.next = 16;
+              return regeneratorRuntime.awrap(client.decrypt({
+                name: name,
+                ciphertext: ciphertext
+              }));
+
+            case 16:
+              _ref = _context.sent;
+              _ref2 = _slicedToArray(_ref, 1);
+              result = _ref2[0];
+              // Writes the decrypted file to disk
+              writeFile = promisify(fs.writeFile);
+              _context.next = 22;
+              return regeneratorRuntime.awrap(writeFile(path.resolve(__dirname, plaintextFileName), Buffer.from(result.plaintext, 'base64')));
+
+            case 22:
+            case "end":
+              return _context.stop();
           }
-        }, _callee);
-      }));
-
-      function decrypt() {
-        return _decrypt.apply(this, arguments);
-      }
-
-      return decrypt;
-    }()
+        }
+      });
+    }
   }, {
     key: "setAccountValues",
     value: function setAccountValues() {
@@ -155,92 +140,72 @@ function () {
     }
   }, {
     key: "deleteSecrets",
-    value: function () {
-      var _deleteSecrets = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee2() {
-        var deleteFile;
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                deleteFile = promisify(fs.unlink);
-                _context2.next = 3;
-                return deleteFile(path.resolve(__dirname, './accounts.json'));
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
+    value: function deleteSecrets() {
+      var deleteFile;
+      return regeneratorRuntime.async(function deleteSecrets$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              deleteFile = promisify(fs.unlink);
+              _context2.next = 3;
+              return regeneratorRuntime.awrap(deleteFile(path.resolve(__dirname, './accounts.json')));
+
+            case 3:
+            case "end":
+              return _context2.stop();
           }
-        }, _callee2);
-      }));
-
-      function deleteSecrets() {
-        return _deleteSecrets.apply(this, arguments);
-      }
-
-      return deleteSecrets;
-    }()
+        }
+      });
+    }
   }, {
     key: "createDNSRecord",
-    value: function () {
-      var _createDNSRecord = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee3() {
-        return regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.prev = 0;
-                this.spinner.start();
-                this.spinner.text = 'Decrypting Cloudflare secrets...';
-                _context3.next = 5;
-                return this.decrypt();
-
-              case 5:
-                this.spinner.text = 'Initializing Cloudflare API...';
-                this.setAccountValues();
-                this.spinner.text = 'Adding A name record...';
-                _context3.next = 10;
-                return this.cf.dnsRecords.add(this.zone, {
-                  type: 'A',
-                  name: this.url,
-                  content: this.ipaddress,
-                  proxied: this.proxy
-                });
-
-              case 10:
-                this.spinner.text = 'Removing secrets...';
-                _context3.next = 13;
-                return this.deleteSecrets();
-
-              case 13:
-                this.spinner.stop();
-                _context3.next = 21;
-                break;
-
-              case 16:
-                _context3.prev = 16;
-                _context3.t0 = _context3["catch"](0);
-                this.spinner.stop();
-                console.log(_context3.t0);
-                throw _context3.t0;
-
-              case 21:
-              case "end":
-                return _context3.stop();
-            }
+    value: function createDNSRecord() {
+      return regeneratorRuntime.async(function createDNSRecord$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              this.spinner.start();
+              this.spinner.text = 'Decrypting Cloudflare secrets...';
+              _context3.next = 5;
+              return regeneratorRuntime.awrap(this.decrypt());
+
+            case 5:
+              this.spinner.text = 'Initializing Cloudflare API...';
+              this.setAccountValues();
+              this.spinner.text = 'Adding A name record...';
+              _context3.next = 10;
+              return regeneratorRuntime.awrap(this.cf.dnsRecords.add(this.zone, {
+                type: 'A',
+                name: this.url,
+                content: this.ipaddress,
+                proxied: this.proxy
+              }));
+
+            case 10:
+              this.spinner.text = 'Removing secrets...';
+              _context3.next = 13;
+              return regeneratorRuntime.awrap(this.deleteSecrets());
+
+            case 13:
+              this.spinner.stop();
+              _context3.next = 21;
+              break;
+
+            case 16:
+              _context3.prev = 16;
+              _context3.t0 = _context3["catch"](0);
+              this.spinner.stop();
+              console.log(_context3.t0);
+              throw _context3.t0;
+
+            case 21:
+            case "end":
+              return _context3.stop();
           }
-        }, _callee3, this, [[0, 16]]);
-      }));
-
-      function createDNSRecord() {
-        return _createDNSRecord.apply(this, arguments);
-      }
-
-      return createDNSRecord;
-    }()
+        }
+      }, null, this, [[0, 16]]);
+    }
   }]);
 
   return CloudflareAPI;