@rpcbase/cli 0.184.0 → 0.186.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.184.0",
+  "version": "0.186.0",
   "type": "module",
   "files": [
     "src"

package/src/cmd-deploy/index.js

@@ -31,18 +31,18 @@ const getInstanceDeployDir = (baseDeployDir, instance) => `${baseDeployDir}-${in
 const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 const sharedInfrastructureIncludePatterns = [
-  "infrastructure/compose.yml",
-  "infrastructure/compose.instances.yml",
-  "infrastructure/package.json",
-  "infrastructure/package-lock.json",
-  "infrastructure/ensure-*",
-  "infrastructure/mongot/***",
-  ".env",
-  ".env.*",
+  "/infrastructure/compose.yml",
+  "/infrastructure/compose.instances.yml",
+  "/infrastructure/package.json",
+  "/infrastructure/package-lock.json",
+  "/infrastructure/ensure-*",
+  "/infrastructure/mongot/***",
+  "/.env",
+  "/.env.*",
 ]
 
 const sharedInfrastructureExcludePatterns = [
-  "infrastructure/data/***",
+  "/infrastructure/data/***",
 ]
 
 const toArray = (value) => {
@@ -382,17 +382,18 @@ export const deploy = async (argv) => {
             ? sharedInfrastructureExcludePatterns.concat(deployExcludePatterns)
             : deployExcludePatterns,
           includePatterns: useBlueGreen
-            ? sharedInfrastructureIncludePatterns.concat(preparedDeploy.sharedEnvFileNames)
+            ? sharedInfrastructureIncludePatterns.concat(preparedDeploy.sharedEnvFileNames.map((name) => `/${name}`))
             : undefined,
         })
 
         if (infrastructureChanged) {
           if (useBlueGreen) {
             if (argv.verbose) console.log(infrastructureDiff)
-            throw new Error("Shared infrastructure files changed. Deploy or restart the shared infrastructure explicitly before running a blue/green app deploy.")
+            console.log("Shared infrastructure files changed; refreshing shared infrastructure before deploying the inactive app instance.")
+          } else {
+            console.log("Infrastructure compose files differ between local and remote (info only; deploy proceeds).")
+            if (argv.verbose) console.log(infrastructureDiff)
           }
-          console.log("Infrastructure compose files differ between local and remote (info only; deploy proceeds).")
-          if (argv.verbose) console.log(infrastructureDiff)
         }
       }
 
@@ -416,6 +417,8 @@ export const deploy = async (argv) => {
         log(`Running: ${infrastructureRsyncCmd}`)
         execSync(infrastructureRsyncCmd, { stdio: argv.verbose ? "inherit" : "ignore" })
         await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && [ -f package.json ] && npm ci || true`)
+        console.log("Refreshing shared infrastructure before deploying the inactive app instance.")
+        await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && for f in ensure-*.js; do [ -f "$f" ] || continue; node "$f"; done && node ctrl.js up-infra prod`, true)
       }
 
       const excludeList = baseExcludeList

package/src/cmd-deploy/private-api.js

@@ -1,6 +1,3 @@
-import fs from "fs"
-import https from "https"
-
 import axios from "axios"
 
 
@@ -11,16 +8,9 @@ const requiredEnv = (env, name) => {
 }
 
 export const createPrivateApiClient = ({env, timeoutMs = 15_000}) => {
-  const httpsAgent = new https.Agent({
-    cert: fs.readFileSync(requiredEnv(env, "RB_PROXY_PRIVATE_API_CLIENT_CERT")),
-    key: fs.readFileSync(requiredEnv(env, "RB_PROXY_PRIVATE_API_CLIENT_KEY")),
-    ca: fs.readFileSync(requiredEnv(env, "RB_PROXY_PRIVATE_API_CA")),
-  })
-
   return axios.create({
     baseURL: requiredEnv(env, "RB_PROXY_PRIVATE_API_URL"),
     timeout: timeoutMs,
-    httpsAgent,
     validateStatus: (status) => status >= 200 && status < 300,
   })
 }