@govuk-pay/cli 0.0.62 → 0.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",

package/readme.md

@@ -83,6 +83,20 @@ clusters:
       - selfservice
       - frontend
 ```
+Custom clusters also support pre-defined options, which can be configured by setting `options` on the cluster config, e.g.
+```yaml
+clusters:
+  - name: my-cool-cluster
+    apps:
+      - connector
+      - selfservice
+      - frontend
+    options:
+      mountLocalNodeApps: true
+      local:
+        - selfservice
+```
+These will be passed in automatically on running `pay local up --cluster my-cool-cluster`
 
 ## Vulnerability Disclosure
 

package/resources/legacy-ruby-cli/.ruby-version

@@ -1 +1 @@
-3.1.1
+3.2.2

package/resources/legacy-ruby-cli/Gemfile.lock

@@ -1314,10 +1314,10 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.8)
     minitest (5.19.0)
     netrc (0.11.0)
-    nokogiri (1.16.5)
+    nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     optimist (3.0.1)
@@ -1334,7 +1334,7 @@ GEM
       process-group
     process-terminal (0.2.0)
       ffi
-    racc (1.7.3)
+    racc (1.8.1)
     rainbow (3.1.1)
     regexp_parser (2.8.0)
     rest-client (2.1.0)

package/resources/pay-local/templates/docker-compose.hbs

@@ -189,7 +189,9 @@ services:
     {{#ifBoth localBuild entrypointOverrideLocal}}
     entrypoint: {{{../entrypointOverrideLocal}}}
     {{else}}
+      {{#unless ../isBundled}}
     entrypoint: "npx nodemon --inspect=0.0.0.0:{{../debugPort}}"
+      {{/unless}}
     {{/ifBoth}}
     ports:
       - "{{port}}:{{port}}"

package/src/commands/local/config/pay_local_cluster.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadCustomClusterConfig = exports.loadServicesConfig = exports.loadClusterConfig = exports.PayLocalCluster = exports.CUSTOM_CLUSTER_NAMES = exports.CUSTOM_CLUSTERS = exports.CUSTOM_CLUSTERS_PATH = exports.CLUSTERS = void 0;
+exports.loadCustomClusterConfig = exports.loadServicesConfig = exports.loadClusterConfig = exports.PayLocalCluster = exports.CUSTOM_CLUSTERS = exports.CUSTOM_CLUSTERS_PATH = exports.CLUSTERS = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const yaml_1 = __importDefault(require("yaml"));
@@ -12,7 +12,6 @@ const configs_1 = require("../../../util/configs");
 exports.CLUSTERS = ['all', 'admin', 'card', 'paymentlinks', 'webhooks', 'endtoend', 'java', 'toolbox'];
 exports.CUSTOM_CLUSTERS_PATH = node_path_1.default.join((0, configs_1.ensureConfigDirectory)('local'), 'custom-clusters.yaml');
 exports.CUSTOM_CLUSTERS = loadCustomClusterConfig(exports.CUSTOM_CLUSTERS_PATH);
-exports.CUSTOM_CLUSTER_NAMES = exports.CUSTOM_CLUSTERS.clusters.map(cluster => cluster.name);
 // This is the complete cluster configuration that will be used as the context for template rendering
 class PayLocalCluster {
     name;
@@ -139,11 +138,14 @@ exports.loadServicesConfig = loadServicesConfig;
 function loadCustomClusterConfig(customClusterPath) {
     try {
         const customClusterFileContents = node_fs_1.default.readFileSync(customClusterPath, 'utf8');
-        return yaml_1.default.parse(customClusterFileContents);
+        const customClusters = yaml_1.default.parse(customClusterFileContents);
+        customClusters.names = customClusters.clusters.map(cluster => cluster.name);
+        return customClusters;
     }
     catch (e) {
         return {
-            clusters: []
+            clusters: [],
+            names: []
         };
     }
 }
@@ -154,7 +156,7 @@ function includeAppInCluster(cluster, options, serviceConfig) {
             return true;
         }
     }
-    else if (exports.CUSTOM_CLUSTER_NAMES.includes(cluster)) {
+    else if (exports.CUSTOM_CLUSTERS.names.includes(cluster)) {
         const customCluster = exports.CUSTOM_CLUSTERS.clusters.filter(c => c.name === cluster)[0];
         if (customCluster.apps.includes(serviceConfig.name)) {
             return true;

package/src/commands/local/subcommands/up.js

@@ -22,7 +22,7 @@ const builder = (yargs) => {
         .usage(`$0 local up | launch [--cluster <cluster>] [--local <app>] [--proxy] [--apps] [--rebuild] [--with-egress-proxy]\n\n${exports.desc}\n\nSpecify a list of apps that should use your locally checked out code using --local`)
         .option('cluster', {
         type: 'string',
-        choices: [].concat(pay_local_cluster_js_1.CLUSTERS, pay_local_cluster_js_1.CUSTOM_CLUSTER_NAMES),
+        choices: [].concat(pay_local_cluster_js_1.CLUSTERS, pay_local_cluster_js_1.CUSTOM_CLUSTERS.names),
         default: 'all',
         description: 'Cluster of services to launch'
     })
@@ -71,7 +71,8 @@ exports.builder = builder;
 exports.handler = upCommandHandler;
 async function upCommandHandler(argv) {
     await (0, standardContent_1.showHeader)();
-    const upOptions = {
+    const customClusterOptions = pay_local_cluster_js_1.CUSTOM_CLUSTERS.names.includes(argv.cluster) ? pay_local_cluster_js_1.CUSTOM_CLUSTERS.clusters.filter(c => c.name === argv.cluster)[0].options : {};
+    const upOptions = Object.assign({
         cluster: argv.cluster,
         proxy: argv.proxy,
         withEgressProxy: argv.withEgressProxy,
@@ -81,7 +82,7 @@ async function upCommandHandler(argv) {
         pull: argv.pull,
         mountLocalNodeApps: argv.mountLocalNodeApps,
         mountPayJSCommons: argv.mountPayJsCommons
-    };
+    }, customClusterOptions);
     await UpHandler(upOptions, false);
 }
 exports.upCommandHandler = upCommandHandler;