From 83299c9bd65b1dc127e49128358074cc625d9dc8 Mon Sep 17 00:00:00 2001
From: Will Scullin <willscullin@google.com>
Date: Tue, 8 Nov 2022 17:29:07 -0600
Subject: [PATCH] NPM CI (#921)

Enable automatic development npm deployments on merge to main.
---
 .npmrc                                        |  1 +
 cloudbuild/build-test/package-extension.sh    |  9 ----
 cloudbuild/deploy/cloudbuild.yaml             | 17 +++----
 cloudbuild/deploy/deploy-patch-extension.sh   |  9 ----
 .../deploy/deploy-prerelease-extension.sh     | 12 -----
 cloudbuild/deploy/malloy-npm-publish.sh       | 20 ++++++++
 default.nix                                   |  2 +-
 package-lock.json                             | 48 +++++++++----------
 package.json                                  |  6 +--
 packages/malloy-db-bigquery/package.json      |  4 +-
 packages/malloy-db-duckdb/package.json        |  4 +-
 packages/malloy-db-postgres/package.json      |  4 +-
 packages/malloy-render/package.json           |  4 +-
 packages/malloy/package.json                  |  2 +-
 test/package.json                             |  8 ++--
 15 files changed, 69 insertions(+), 81 deletions(-)
 create mode 100644 .npmrc
 delete mode 100755 cloudbuild/build-test/package-extension.sh
 delete mode 100755 cloudbuild/deploy/deploy-patch-extension.sh
 delete mode 100755 cloudbuild/deploy/deploy-prerelease-extension.sh
 create mode 100755 cloudbuild/deploy/malloy-npm-publish.sh

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000000000..ae643592e
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}
diff --git a/cloudbuild/build-test/package-extension.sh b/cloudbuild/build-test/package-extension.sh
deleted file mode 100755
index 2adadcddf..000000000
--- a/cloudbuild/build-test/package-extension.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-set -euxo pipefail
-
-nix-shell --quiet --pure --command "$(cat <<NIXCMD
-  cd /workspace
-  npm ci --silent
-  npm run package-extension
-NIXCMD
-)"
diff --git a/cloudbuild/deploy/cloudbuild.yaml b/cloudbuild/deploy/cloudbuild.yaml
index e8c89b9cd..4be8faf0c 100644
--- a/cloudbuild/deploy/cloudbuild.yaml
+++ b/cloudbuild/deploy/cloudbuild.yaml
@@ -1,19 +1,16 @@
 steps:
-  - id: deploy-marketplace
+  - id: deploy-npm
     name: "nixos/nix"
     entrypoint: sh
     args:
       - -c
       - "./cloudbuild/deploy/$TRIGGER_NAME.sh"
     timeout: "1600s"
-    secretEnv: ["VSCE_PAT", "GA_API_SECRET", "GA_MEASUREMENT_ID"]
-logsBucket: "gs://malloy-cloudbuild-logs"
-timeout: "1600s"
+    secretEnv: ["NPM_TOKEN"]
+options:
+  logging: CLOUD_LOGGING_ONLY
+timeout: "1800s"
 availableSecrets:
   secretManager:
-    - versionName: projects/malloy-303216/secrets/marketplace-prerelease-CI/versions/latest
-      env: "VSCE_PAT"
-    - versionName: projects/malloy-303216/secrets/vscode-extension-CI-GA-API-SECRET/versions/latest
-      env: "GA_API_SECRET"
-    - versionName: projects/malloy-303216/secrets/vscode-extension-CI-GA-MEASUREMENT-ID/versions/latest
-      env: "GA_MEASUREMENT_ID"
+    - versionName: projects/malloy-303216/secrets/npm-publish/versions/latest
+      env: "NPM_TOKEN"
diff --git a/cloudbuild/deploy/deploy-patch-extension.sh b/cloudbuild/deploy/deploy-patch-extension.sh
deleted file mode 100755
index 9647ad0a0..000000000
--- a/cloudbuild/deploy/deploy-patch-extension.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-set -euxo pipefail
-
-nix-shell --pure --keep VSCE_PAT --keep GA_API_SECRET --keep GA_MEASUREMENT_ID --command  "$(cat <<NIXCMD
-  cd /workspace
-  npm ci --loglevel error
-  npm run build && npm run vscode-publish-extensions patch
-NIXCMD
-)"
\ No newline at end of file
diff --git a/cloudbuild/deploy/deploy-prerelease-extension.sh b/cloudbuild/deploy/deploy-prerelease-extension.sh
deleted file mode 100755
index d60dd46b0..000000000
--- a/cloudbuild/deploy/deploy-prerelease-extension.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-set -euxo pipefail
-
-nix-shell --pure --keep VSCE_PAT --keep GA_API_SECRET --keep GA_MEASUREMENT_ID --command  "$(cat <<NIXCMD
-  cd /workspace
-  npm ci --loglevel error
-  npm run build && npm run vscode-publish-extensions pre-release
-  publish_status=\$?
-  echo DEBUG PUBLISH-EXTENSION STATUS \$publish_status
-  exit \$publish_status
-NIXCMD
-)"
diff --git a/cloudbuild/deploy/malloy-npm-publish.sh b/cloudbuild/deploy/malloy-npm-publish.sh
new file mode 100755
index 000000000..d1c4cbe44
--- /dev/null
+++ b/cloudbuild/deploy/malloy-npm-publish.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+
+export PACKAGES="packages/malloy packages/malloy-db-bigquery packages/malloy-db-duckdb packages/malloy-db-postgres packages/malloy-render"
+
+nix-shell --pure --keep NPM_TOKEN --keep PACKAGES --command "$(cat <<NIXCMD
+  set -euxo pipefail
+  cd /workspace
+  npm --no-audit --no-fund ci --loglevel error
+  npm run build
+  echo Publishing \$PACKAGES
+  PRERELEASE=\$(date +%y%m%d%H%M%S)
+  for package in \$PACKAGES; do
+    VERSION=\$(jq -r .version \$package/package.json)
+    echo Publishing \$package \$VERSION-\$PRERELEASE
+    npm version -w \$package \$VERSION-\$PRERELEASE
+    npm publish -w \$package --tag next
+  done
+NIXCMD
+)"
diff --git a/default.nix b/default.nix
index 2ca249211..f615974e2 100644
--- a/default.nix
+++ b/default.nix
@@ -1 +1 @@
-with import <nixpkgs> {}; stdenv.mkDerivation { name = "malloy"; buildInputs = [ nodejs-16_x jdk8 google-cloud-sdk postgresql ruby.devEnv git fakeroot]; }
+with import <nixpkgs> {}; stdenv.mkDerivation { name = "malloy"; buildInputs = [ nodejs-16_x jdk8 google-cloud-sdk postgresql ruby.devEnv git jq fakeroot]; }
diff --git a/package-lock.json b/package-lock.json
index 625fd3932..e38d1c68c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,9 +10,9 @@
       "license": "GPL-2.0",
       "devDependencies": {
         "@jest/globals": "^26.6.2",
-        "@malloydata/db-bigquery": "0.0.5",
-        "@malloydata/malloy": "0.0.5",
-        "@malloydata/render": "0.0.5",
+        "@malloydata/db-bigquery": "0.0.6",
+        "@malloydata/malloy": "0.0.6",
+        "@malloydata/render": "0.0.6",
         "@types/archiver": "^5.3.1",
         "@types/fs-extra": "^9.0.13",
         "@types/jest-expect-message": "^1.0.3",
@@ -20681,7 +20681,7 @@
     },
     "packages/malloy": {
       "name": "@malloydata/malloy",
-      "version": "0.0.5",
+      "version": "0.0.6",
       "license": "GPL-2.0",
       "dependencies": {
         "antlr4ts": "^0.5.0-alpha.4",
@@ -20698,22 +20698,22 @@
     },
     "packages/malloy-db-bigquery": {
       "name": "@malloydata/db-bigquery",
-      "version": "0.0.5",
+      "version": "0.0.6",
       "license": "GPL-2.0",
       "dependencies": {
         "@google-cloud/bigquery": "^5.5.0",
         "@google-cloud/common": "^3.6.0",
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "gaxios": "^4.2.0"
       }
     },
     "packages/malloy-db-duckdb": {
       "name": "@malloydata/db-duckdb",
-      "version": "0.0.5",
+      "version": "0.0.6",
       "license": "GPL-2.0",
       "dependencies": {
         "@duckdb/duckdb-wasm": "^1.17.0",
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "duckdb": "0.5.1"
       }
     },
@@ -20728,10 +20728,10 @@
     },
     "packages/malloy-db-postgres": {
       "name": "@malloydata/db-postgres",
-      "version": "0.0.5",
+      "version": "0.0.6",
       "license": "GPL-2.0",
       "dependencies": {
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "@types/pg": "^8.6.1",
         "pg": "^8.7.1",
         "pg-query-stream": "4.2.3"
@@ -20739,10 +20739,10 @@
     },
     "packages/malloy-render": {
       "name": "@malloydata/render",
-      "version": "0.0.5",
+      "version": "0.0.6",
       "license": "GPL-2.0",
       "dependencies": {
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "us-atlas": "^3.0.0",
         "vega": "^5.21.0",
         "vega-lite": "^5.2.0"
@@ -20750,10 +20750,10 @@
     },
     "test": {
       "dependencies": {
-        "@malloydata/db-bigquery": "0.0.5",
-        "@malloydata/db-duckdb": "0.0.5",
-        "@malloydata/db-postgres": "0.0.5",
-        "@malloydata/malloy": "0.0.5"
+        "@malloydata/db-bigquery": "0.0.6",
+        "@malloydata/db-duckdb": "0.0.6",
+        "@malloydata/db-postgres": "0.0.6",
+        "@malloydata/malloy": "0.0.6"
       }
     },
     "vscode-extension": {
@@ -24709,7 +24709,7 @@
       "requires": {
         "@google-cloud/bigquery": "^5.5.0",
         "@google-cloud/common": "^3.6.0",
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "gaxios": "^4.2.0"
       }
     },
@@ -24717,14 +24717,14 @@
       "version": "file:packages/malloy-db-duckdb",
       "requires": {
         "@duckdb/duckdb-wasm": "^1.17.0",
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "duckdb": "0.5.1"
       }
     },
     "@malloydata/db-postgres": {
       "version": "file:packages/malloy-db-postgres",
       "requires": {
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "@types/pg": "^8.6.1",
         "pg": "^8.7.1",
         "pg-query-stream": "4.2.3"
@@ -24746,7 +24746,7 @@
     "@malloydata/render": {
       "version": "file:packages/malloy-render",
       "requires": {
-        "@malloydata/malloy": "^0.0.5",
+        "@malloydata/malloy": "0.0.6",
         "us-atlas": "^3.0.0",
         "vega": "^5.21.0",
         "vega-lite": "^5.2.0"
@@ -33971,10 +33971,10 @@
     "test": {
       "version": "file:test",
       "requires": {
-        "@malloydata/db-bigquery": "0.0.5",
-        "@malloydata/db-duckdb": "0.0.5",
-        "@malloydata/db-postgres": "0.0.5",
-        "@malloydata/malloy": "0.0.5"
+        "@malloydata/db-bigquery": "0.0.6",
+        "@malloydata/db-duckdb": "0.0.6",
+        "@malloydata/db-postgres": "0.0.6",
+        "@malloydata/malloy": "0.0.6"
       }
     },
     "test-exclude": {
diff --git a/package.json b/package.json
index c5d7dee60..0f1d7de20 100644
--- a/package.json
+++ b/package.json
@@ -38,9 +38,9 @@
   },
   "devDependencies": {
     "@jest/globals": "^26.6.2",
-    "@malloydata/db-bigquery": "0.0.5",
-    "@malloydata/malloy": "0.0.5",
-    "@malloydata/render": "0.0.5",
+    "@malloydata/db-bigquery": "0.0.6",
+    "@malloydata/malloy": "0.0.6",
+    "@malloydata/render": "0.0.6",
     "@types/archiver": "^5.3.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest-expect-message": "^1.0.3",
diff --git a/packages/malloy-db-bigquery/package.json b/packages/malloy-db-bigquery/package.json
index 77d3e8872..d58271a1e 100644
--- a/packages/malloy-db-bigquery/package.json
+++ b/packages/malloy-db-bigquery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@google-cloud/bigquery": "^5.5.0",
     "@google-cloud/common": "^3.6.0",
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "gaxios": "^4.2.0"
   }
 }
diff --git a/packages/malloy-db-duckdb/package.json b/packages/malloy-db-duckdb/package.json
index 544f0cb8e..6d34bd2d5 100644
--- a/packages/malloy-db-duckdb/package.json
+++ b/packages/malloy-db-duckdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "^1.17.0",
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "duckdb": "0.5.1"
   }
 }
diff --git a/packages/malloy-db-postgres/package.json b/packages/malloy-db-postgres/package.json
index 2dcc43308..494bd9f92 100644
--- a/packages/malloy-db-postgres/package.json
+++ b/packages/malloy-db-postgres/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"
diff --git a/packages/malloy-render/package.json b/packages/malloy-render/package.json
index b4b571b49..c74a08661 100644
--- a/packages/malloy-render/package.json
+++ b/packages/malloy-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "us-atlas": "^3.0.0",
     "vega": "^5.21.0",
     "vega-lite": "^5.2.0"
diff --git a/packages/malloy/package.json b/packages/malloy/package.json
index 90af9dff0..da328d873 100644
--- a/packages/malloy/package.json
+++ b/packages/malloy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/test/package.json b/test/package.json
index a9cae8e9f..17bb6dba5 100644
--- a/test/package.json
+++ b/test/package.json
@@ -9,9 +9,9 @@
     "malloyc": "ts-node ../scripts/malloy-to-json"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.5",
-    "@malloydata/db-bigquery": "0.0.5",
-    "@malloydata/db-postgres": "0.0.5",
-    "@malloydata/db-duckdb": "0.0.5"
+    "@malloydata/malloy": "0.0.6",
+    "@malloydata/db-bigquery": "0.0.6",
+    "@malloydata/db-postgres": "0.0.6",
+    "@malloydata/db-duckdb": "0.0.6"
   }
 }