@leverege/build-tools 2.3.0 → 2.3.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.3.1] = 2020-05-10
+### Updated
+- (Circleate) Updated support for UI circle config
+
 ## [2.2.3] = 2020-04-22
 ### Updated
 - (Helmify) Added a CLI interface for Helmup

package/lib/web/packleate/Packleator.js

@@ -80,7 +80,7 @@ var Packleator = /*#__PURE__*/function () {
 
     var args = options.args;
     this.privatePackages = new Set();
-    this.args = args ? _objectSpread(_objectSpread({}, args), {}, {
+    this.args = args ? _objectSpread({}, args, {
       output: args.output.substr(-1) === '/' ? args.output.substr(0, args.output.length) : args.output
     }) : {}; // args || {}
 

package/lib/web/packleate/index.js

@@ -125,7 +125,7 @@ function _main() {
             break;
 
           case 4:
-            packleator = new Packleator(_objectSpread(_objectSpread({}, defaultConfig), {}, {
+            packleator = new Packleator(_objectSpread({}, defaultConfig, {
               args: args
             }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/circleate

@@ -475,73 +475,66 @@ EOCIRCLE
 }
 
 create_ui_config(){
-  # Determine URLs per environment
-  echo "Please provide the dev site URL"
-  read DEV_URL
+  cat<<FIREBASEINFO
+  
+  You need to setup Firebase hosting using the cli tool before configuring CI.
+  Please make sure .firebaserc and firebase.json are configured with targets set like:
 
-  echo "Please provide the prod site URL"
-  read PROD_URL
+  {
+    "projects": {
+      "default": "leverege-jumpstart"
+    },
+    "targets": {
+      "leverege-jumpstart": {
+        "hosting": {
+          "unique-target-name": [
+            "target-name-on-firebase-console"
+          ]
+        }
+      }
+    }
+  }
 
-  # Determine GCP project
-  echo "Please provide the dev GCP project id"
-  read DEV_PROJECT
+  You can add target using:
+
+  $ firebase target:apply hosting <unique-target-name> <target-name-on-firebase-console>
+
+  (See https://firebase.google.com/docs/hosting/quickstart for more info)
+
+  Enter "yes" if everything is set up & ready to go.
+
+FIREBASEINFO
 
-  echo "Please provide the prod GCP project id"
-  read PROD_PROJECT
+  read ANS && [ "$ANS" != "yes" ] && exit 1
+
+  # Determine dev environment
+  printf "\n\nCommits to the dev branch will trigger deployment approval to the dev site.\n"
+  printf "\nPlease provide the Firebase Project name to be used for dev/testing UI: "
+  read DEV_PROJ
+
+  printf "\nPlease provide the host target for the dev site (target name in .firebaserc): "
+  read DEV_TARGET
+
+  # Determine prod environment
+  printf "\nPlease provide the Firebase Project name to be used for production UI: "
+  read PRD_PROJ
+
+  # Determine GCP project
+  printf "\nPlease provide the host target for the production site (target name in .firebaserc): "
+  read PRD_TARGET
 
   # Build circle config based on variables
   cat<<EOCIRCLE > config.yml
 version: 2.1
 orbs:
-  gcp-gcr: circleci/gcp-cli@1.0.4
-executors:
-  google:
-    description: The official Google docker container with gcloud SDK pre-installed
-    docker:
-      - image: google/cloud-sdk
+  slack: circleci/slack@3.4.2
 
 jobs:
-  gcs-dev:
-    executor: google
-    steps: 
-      - attach_workspace:
-          at: ~/project
-      # https://gist.github.com/DarrenN/8c6a5b969481725a4413
-      - run: |
-           echo "export PACKAGE_VERSION=v\$(grep -m1 version package.json | awk -F: '{ print \$2 }' | sed 's/[", ]//g')" >> \$BASH_ENV
-      - gcp-gcr/initialize
-      - run: |
-          gsutil mb gs://\$PACKAGE_VERSION.$DEV_URL
-          gsutil -m cp -r ./project/image/* gs://\$PACKAGE_VERSION.$DEV_URL
-          gsutil setmeta -h "Content-Encoding:gzip" gs://\$PACKAGE_VERSION.$DEV_URL/bundle.js
-          gsutil iam ch allUsers:objectViewer gs://$DEV_URL
-      - run: |
-          gsutil mb gs://$DEV_URL
-          gsutil -m rm gs://$DEV_URL/**
-          gsutil -m cp -r gs://\$PACKAGE_VERSION.$DEV_URL/* gs://$DEV_URL
-          gsutil setmeta -h "Content-Encoding:gzip" gs://$DEV_URL/bundle.js
-          gsutil iam ch allUsers:objectViewer gs://$DEV_URL
-
-  gcs-prod:
-    executor: google
-    steps: 
-      - attach_workspace:
-          at: ~/project
-      # https://gist.github.com/DarrenN/8c6a5b969481725a4413
-      - run: |
-           echo "export PACKAGE_VERSION=v\$(grep -m1 version package.json | awk -F: '{ print \$2 }' | sed 's/[", ]//g')" >> \$BASH_ENV
-      - gcp-gcr/initialize
-      - run: |
-          gsutil mb gs://\$PACKAGE_VERSION.$PROD_URL
-          gsutil -m cp -r ./project/image/* gs://\$PACKAGE_VERSION.$PROD_URL
-          gsutil setmeta -h "Content-Encoding:gzip" gs://\$PACKAGE_VERSION.$PROD_URL/bundle.js
-          gsutil iam ch allUsers:objectViewer gs://$PROD_URL
-      - run: |
-          gsutil mb gs://$PROD_URL
-          gsutil -m rm gs://$PROD_URL/**
-          gsutil -m cp -r gs://\$PACKAGE_VERSION.$PROD_URL/* gs://$PROD_URL
-          gsutil setmeta -h "Content-Encoding:gzip" gs://$PROD_URL/bundle.js
-          gsutil iam ch allUsers:objectViewer gs://$PROD_URL
+  status:
+    docker:
+      - image: cimg/base:2020.01
+    steps:
+      - slack/status
 
   build:
     docker:
@@ -564,30 +557,40 @@ jobs:
           paths:
             - ./node_modules
 
-      - run: 
-          name: Install license-checker
-          command: npm install license-checker
-
-      - run:
-          name: Check for license violations (e.g. GPL)
-          command: npm run licenseCheck
-
       - run:
           name: Bundle using webpack
           command: |
             npm run clean
             npm run build
-            rm -fr ./image
-            mkdir ./image
-            cp -fr ./dist/* ./image/
-            gzip ./image/bundle.js
-            mv ./image/bundle.js.gz ./image/bundle.js
+            gzip ./dist/bundle.js
+            mv ./dist/bundle.js.gz ./dist/bundle.js
 
       - persist_to_workspace:
           root: ~/project
           paths:
-            - image/*
-            - package.json
+            - dist
+
+  deploy-dev: 
+    docker:
+      - image: circleci/node:erbium
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm install -g firebase-tools
+      - run:
+          name: Deploy to dev site
+          command: firebase use $DEV_PROJ && firebase deploy --token "\$FIREBASE_TOKEN" --only hosting:$DEV_TARGET
+
+  deploy-prod: 
+    docker:
+      - image: circleci/node:erbium
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm install -g firebase-tools
+      - run:
+          name: Deploy to dev site
+          command: firebase use $PRD_PROJ && firebase deploy --token "\$FIREBASE_TOKEN" --only hosting:$PRD_TARGET
 
 workflows:
   version: 2.1
@@ -595,13 +598,21 @@ workflows:
     jobs:
       - build:
           context: npm 
-      - gcs-dev:
-          context: $DEV_PROJECT
+      - slack/approval-notification:
+          context: slack
+      - deploy-dev:
+          context: firebase
+          type: approval
           filters:
             branches:
-              only: /release-.*/
+              only: development
           requires:
             - build
+      - status: 
+          context: slack
+          requires: 
+            - deploy-dev
+
   build-deploy-prod:
     jobs:
       - build:
@@ -609,13 +620,20 @@ workflows:
           filters:
             branches:
               only: master
-      - gcs-prod:
-          context: $PROD_PROJECT
+      - slack/approval-notification:
+          context: slack
+      - deploy-prod:
+          context: firebase
+          type: approval
           filters:
             branches:
               only: master
           requires:
             - build
+      - status: 
+          context: slack
+          requires: 
+            - deploy-prod
 
 EOCIRCLE
 }

package/src/helmup

@@ -21,12 +21,13 @@ PLATFORM=(
 SYSTEM=(
   coredns
   elastic
-  polaris
   redis
+  mysql
+  postgres
   velero
   reloader
   tiller
-# monitoring
+  monitoring
 # custom-metrics
 )
 
@@ -412,7 +413,7 @@ function doInstall() {
         ;;
 
       "mysql")
-        helm dep up ./mysql && helm upgrade --install mysql ./mysql
+        helm upgrade --install mysql stable/mysql -f mysql/mysql-values.yaml --version 1.6.3
         printf "\n***Proxy 4306 with this => kubectl port-forward svc/mysql 4306:3306\n\n"
         printf "\n***Grab MYSQL Root Password => MYSQL_ROOT_PASSWORD=\$(kubectl get secret --namespace default mysql -o jsonpath="{.data.mysql-root-password}" | base64 --decode; echo)"
         printf "\n***Set MYSQL_HOST to 127.0.0.1 and MYSQL_PORT to 4306 and run => mysql -h \${MYSQL_HOST} -P\${MYSQL_PORT} -u root -p\${MYSQL_ROOT_PASSWORD} \n\n"
@@ -425,6 +426,10 @@ function doInstall() {
         printf "\n***Proxy 8081 with this=> kubectl port-forward --namespace polaris svc/polaris-dashboard 8081:80\n\n"
         ;;
 
+      "postgres"|"postgresql")
+        helm repo add bitnami https://charts.bitnami.com/bitnami
+        helm upgrade --install postgres bitnami/postgresql -f postgres/postgres-values.yaml --version 8.9.6
+
       "redis")
         # https://github.com/helm/charts/tree/master/stable/redis
         [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="v9.1.5"