@govuk-pay/cli 0.0.32 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",
@@ -22,7 +22,8 @@
     "openurl": "^1.1.1",
     "semver": "^7.6.3",
     "totp-generator": "^1.0.0",
-    "yaml": "^2.5.1"
+    "yaml": "^2.5.1",
+    "yargs": "^17.7.2"
   },
   "files": [
     "resources",

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

@@ -39,7 +39,7 @@ services:
         condition: service_healthy
     {{/if}}
     healthcheck:
-      test: ["CMD", "wget", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
+      test: ["CMD", "wget", "-Y", "off", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
       interval: 10s
       timeout: 5s
       retries: 12
@@ -82,7 +82,7 @@ services:
       - HTTP_PROXY_PORT=8080
       - HTTPS_PROXY_PORT=8080
       - HTTP_PROXY_SCHEME=http
-      - NO_PROXY={{noProxyEnvVar}}
+      - NO_PROXY={{../noProxyEnvVar}}
       {{/if}}
 
       {{#if hasSQSQueues}}
@@ -134,7 +134,7 @@ services:
         condition: service_healthy
     {{/if}}
     healthcheck:
-      test: ["CMD", "wget", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
+      test: ["CMD", "wget", "-Y", "off", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
       interval: 10s
       timeout: 5s
       retries: 12
@@ -146,6 +146,9 @@ services:
     {{#ifBoth ../mountLocalNodeApps localBuild}}
     volumes:
       - "$WORKSPACE/pay-{{../name}}:/app"
+      {{#if ../../mountPayJSCommons}}
+      - "$WORKSPACE/pay-js-commons:/pay-js-commons"
+      {{/if}}
     {{/ifBoth}}
     environment:
       - BIND_HOST=0.0.0.0
@@ -222,7 +225,7 @@ services:
     image: governmentdigitalservice/pay-egress:latest-master
     container_name: egress
     volumes:
-      - "{{defaultServiceConfigsPath}}/egress/squid.conf:/etc/squid/squid.conf"
+      - "{{defaultServiceConfigsPath}}/services/egress/squid.conf:/etc/squid/squid.conf"
     networks:
       pay_local_mimic_aws_vpc:
         ipv4_address: 172.18.0.253

package/src/commands/browse.js

@@ -1,33 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logBrowseCommands = void 0;
-const path = __importStar(require("path"));
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const standardContent_js_1 = require("../core/standardContent.js");
 const moduleFunctionWrapper_js_1 = require("../util/moduleFunctionWrapper.js");
-const constants_1 = require("../core/constants");
 const requestableItems = new Map();
 requestableItems.set('concourse', {
     name: 'concourse page',
@@ -45,51 +20,25 @@ requestableItems.set('status', {
     name: 'status page',
     url: 'https://payments.statuspage.io/'
 });
-function logBrowseCommands() {
-    console.log(`Commands:
-    pay browse concourse       # browses the concourse page
-    pay browse help [COMMAND]  # Describe subcommands or one specific subcommand
-    pay browse manual          # browses the pay team manual
-    pay browse repo            # browses the pay-infra github repo
-    pay browse status          # browses the pay status page`);
-}
-exports.logBrowseCommands = logBrowseCommands;
-function logNoCommand(argumentName) {
-    console.error(`Could not find command "${argumentName}".`);
-    console.log(`The available options are: "${Array.from(requestableItems.keys()).join('", "')}".`);
-}
-async function browseHandler(options) {
+exports.command = 'browse <location>';
+exports.desc = 'Open a web browser to useful locations';
+const builder = (yargs) => {
+    return yargs.positional('location', {
+        choices: [...requestableItems.keys()]
+    });
+};
+exports.builder = builder;
+exports.handler = browseHandler;
+async function browseHandler(argv) {
+    console.log(argv);
     await (0, standardContent_js_1.showHeader)();
-    if (options.arguments.length === 0) {
-        logBrowseCommands();
-        return;
-    }
-    if (options.arguments[0] === 'help') {
-        const argumentName = options.arguments[1];
-        if (argumentName === undefined || argumentName.trim() === '') {
-            logBrowseCommands();
-            return;
-        }
-        const requestedItem = requestableItems.get(argumentName);
-        if (requestedItem != null) {
-            console.log('Usage:');
-            console.log(`  npx --package=${path.resolve(constants_1.rootDir)} browse ${argumentName}`);
-            console.log(`browses the ${requestedItem.name}`);
-            return;
+    const location = argv.location;
+    const requestedItem = requestableItems.get(location);
+    console.log(`Opening the ${requestedItem.name}`);
+    moduleFunctionWrapper_js_1.moduleFunctionWrapper.open(requestedItem.url, (err) => {
+        if (err != null) {
+            console.log(`Failed to open browser, please visit ${requestedItem.url}`);
         }
-        logNoCommand(argumentName);
-        return;
-    }
-    const requestedItem = requestableItems.get(options.arguments[0]);
-    if (requestedItem != null) {
-        console.log(`Opening the ${requestedItem.name}`);
-        moduleFunctionWrapper_js_1.moduleFunctionWrapper.open(requestedItem.url, (err) => {
-            if (err != null) {
-                console.log(`Failed to open browser, please visit ${requestedItem.url}`);
-            }
-        });
-        return;
-    }
-    logNoCommand(options.arguments[0]);
+    });
 }
 exports.default = browseHandler;

package/src/commands/browse.spec.js

@@ -5,77 +5,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 // import * as open from 'open'
 const globals_1 = require("@jest/globals");
-const moduleFunctionWrapper_js_1 = require("../util/moduleFunctionWrapper.js");
-const browse_js_1 = __importDefault(require("./browse.js"));
-const commandsText = `Commands:
-    pay browse concourse       # browses the concourse page
-    pay browse help [COMMAND]  # Describe subcommands or one specific subcommand
-    pay browse manual          # browses the pay team manual
-    pay browse repo            # browses the pay-infra github repo
-    pay browse status          # browses the pay status page`;
+const moduleFunctionWrapper_1 = require("../util/moduleFunctionWrapper");
+const browse_1 = __importDefault(require("./browse"));
 (0, globals_1.describe)('browse command', () => {
     (0, globals_1.beforeEach)(() => {
         globals_1.jest.spyOn(console, 'log').mockImplementation(() => { });
         globals_1.jest.spyOn(console, 'error').mockImplementation(() => { });
-        globals_1.jest.spyOn(moduleFunctionWrapper_js_1.moduleFunctionWrapper, 'open').mockImplementation(() => { });
+        globals_1.jest.spyOn(moduleFunctionWrapper_1.moduleFunctionWrapper, 'open').mockImplementation(() => { });
     });
     (0, globals_1.afterEach)(() => {
         globals_1.jest.restoreAllMocks();
         globals_1.jest.resetModules();
     });
-    (0, globals_1.it)('should show usage when no additional params are provided', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: [] });
-        (0, globals_1.expect)(console.log).toHaveBeenCalledWith(commandsText);
-    });
     (0, globals_1.it)('should open the browser when manual is provided as the first param', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['manual'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://manual.payments.service.gov.uk/', globals_1.expect.any(Function));
+        const argv = { _: ['browse'], $0: 'pay', location: 'manual' };
+        await (0, browse_1.default)(argv);
+        (0, globals_1.expect)(moduleFunctionWrapper_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://manual.payments.service.gov.uk/', globals_1.expect.any(Function));
         (0, globals_1.expect)(console.log).toHaveBeenCalledWith('Opening the team manual');
         (0, globals_1.expect)(console.error).not.toHaveBeenCalled();
     });
     (0, globals_1.it)('should open the browser when concourse is provided as the first param', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['concourse'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://pay-cd.deploy.payments.service.gov.uk/', globals_1.expect.any(Function));
+        const argv = { _: ['browse'], $0: 'pay', location: 'concourse' };
+        await (0, browse_1.default)(argv);
+        (0, globals_1.expect)(moduleFunctionWrapper_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://pay-cd.deploy.payments.service.gov.uk/', globals_1.expect.any(Function));
         (0, globals_1.expect)(console.log).toHaveBeenCalledWith('Opening the concourse page');
         (0, globals_1.expect)(console.error).not.toHaveBeenCalled();
     });
     (0, globals_1.it)('should open the browser when repo is provided as the first param', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['repo'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://github.com/alphagov/pay-infra', globals_1.expect.any(Function));
+        const argv = { _: ['browse'], $0: 'pay', location: 'repo' };
+        await (0, browse_1.default)(argv);
+        (0, globals_1.expect)(moduleFunctionWrapper_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://github.com/alphagov/pay-infra', globals_1.expect.any(Function));
         (0, globals_1.expect)(console.log).toHaveBeenCalledWith('Opening the pay-infra github repository');
         (0, globals_1.expect)(console.error).not.toHaveBeenCalled();
     });
     (0, globals_1.it)('should open the browser when status is provided as the first param', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['status'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://payments.statuspage.io/', globals_1.expect.any(Function));
+        const argv = { _: ['browse'], $0: 'pay', location: 'status' };
+        await (0, browse_1.default)(argv);
+        (0, globals_1.expect)(moduleFunctionWrapper_1.moduleFunctionWrapper.open).toHaveBeenCalledWith('https://payments.statuspage.io/', globals_1.expect.any(Function));
         (0, globals_1.expect)(console.log).toHaveBeenCalledWith('Opening the status page');
         (0, globals_1.expect)(console.error).not.toHaveBeenCalled();
     });
-    (0, globals_1.it)('should show the help page when requested', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['help'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).not.toHaveBeenCalled();
-        (0, globals_1.expect)(console.log).toHaveBeenCalledWith(`Commands:
-    pay browse concourse       # browses the concourse page
-    pay browse help [COMMAND]  # Describe subcommands or one specific subcommand
-    pay browse manual          # browses the pay team manual
-    pay browse repo            # browses the pay-infra github repo
-    pay browse status          # browses the pay status page`);
-    });
-    (0, globals_1.it)('should details about a command', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['help', 'manual'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).not.toHaveBeenCalled();
-        (0, globals_1.expect)(console.log).toHaveBeenCalledWith('Usage:');
-        (0, globals_1.expect)(console.log).toHaveBeenCalledWith('browses the team manual');
-    });
-    (0, globals_1.it)('should handle an unknown command', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['abcdef'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).not.toHaveBeenCalled();
-        (0, globals_1.expect)(console.error).toHaveBeenCalledWith('Could not find command "abcdef".');
-        (0, globals_1.expect)(console.log).toHaveBeenCalledWith('The available options are: "concourse", "manual", "repo", "status".');
-    });
-    (0, globals_1.it)('should handle an unknown command within help', async () => {
-        await (0, browse_js_1.default)({ commandName: 'browse', arguments: ['help', 'abcdef'] });
-        (0, globals_1.expect)(moduleFunctionWrapper_js_1.moduleFunctionWrapper.open).not.toHaveBeenCalled();
-        (0, globals_1.expect)(console.error).toHaveBeenCalledWith('Could not find command "abcdef".');
-    });
 });

package/src/commands/demo.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-async function demoHandler(options) {
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
+const standardContent_1 = require("../core/standardContent");
+exports.command = 'demo';
+exports.desc = false; // Hide command from generated help
+exports.builder = {};
+exports.handler = demoHandler;
+async function demoHandler(argv) {
+    await (0, standardContent_1.showHeader)();
     console.log('This is where you would put your implementation.');
     await new Promise((resolve) => {
         setTimeout(resolve, 10);
@@ -8,4 +15,3 @@ async function demoHandler(options) {
     console.log('It can be asynchronous.');
     console.error('You can also write to stderr.');
 }
-exports.default = demoHandler;

package/src/commands/legacy.js

@@ -23,25 +23,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyHandlerOptionsToLegacyCli = exports.proxyArrayOfArgumentsToLegacyCli = void 0;
+exports.proxyArrayOfArgumentsToLegacyCli = exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const payCliExec_1 = __importStar(require("../util/payCliExec"));
 const path = __importStar(require("node:path"));
 const constants_1 = require("../core/constants");
-const standardContent_1 = require("../core/standardContent");
 const pathToLegacyRubyCli = path.join(constants_1.rootDir, 'resources', 'legacy-ruby-cli');
-async function legacyHandler(options) {
-    const argsToPassOn = [];
-    if (options.commandName !== 'legacy') {
-        argsToPassOn.unshift(options.commandName);
-    }
-    options.arguments.forEach((arg) => {
-        argsToPassOn.push(arg);
-    });
+exports.command = 'legacy';
+exports.desc = 'Pass through to legacy ruby cli';
+const commandDesc = '$0 legacy -- {ruby version command and options}';
+const longDesc = 'Use the legacy ruby version of the pay cli, passing through commands, options etc. The legacy command itself should be followed by `--` then the command from the ruby version followed by it\'s parameters and options. e.g. use `pay legacy -- help` to run help on the legacy version.';
+const builder = (yargs) => {
+    return yargs.usage(`${commandDesc}\n\n${longDesc}`);
+};
+exports.builder = builder;
+exports.handler = legacyHandler;
+async function legacyHandler(argv) {
+    const argsToPassOn = argv._.slice(1);
     await proxyArrayOfArgumentsToLegacyCli(argsToPassOn);
 }
-exports.default = legacyHandler;
 async function proxyArrayOfArgumentsToLegacyCli(argsToPassOn) {
-    await (0, standardContent_1.showHeader)();
     const rbenvCommand = process.env.PAY_CLI_RBENV_COMMAND ?? 'rbenv';
     const shellCommand = process.env.PAY_CLI_SHELL_COMMAND ?? 'zsh';
     const whichRbenvResult = await (0, payCliExec_1.execAndReturnIO)(`which ${rbenvCommand}`);
@@ -67,7 +67,3 @@ async function proxyArrayOfArgumentsToLegacyCli(argsToPassOn) {
     });
 }
 exports.proxyArrayOfArgumentsToLegacyCli = proxyArrayOfArgumentsToLegacyCli;
-async function proxyHandlerOptionsToLegacyCli(options) {
-    await proxyArrayOfArgumentsToLegacyCli([options.commandName].concat(options.arguments));
-}
-exports.proxyHandlerOptionsToLegacyCli = proxyHandlerOptionsToLegacyCli;

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

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadServicesConfig = exports.loadClusterConfig = exports.PayLocalCluster = void 0;
+exports.loadServicesConfig = exports.loadClusterConfig = exports.PayLocalCluster = 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"));
 const md5_js_1 = require("../../../util/md5.js");
+exports.CLUSTERS = ['all', 'admin', 'card', 'paymentlinks', 'webhooks', 'endtoend', 'java', 'toolbox'];
 // This is the complete cluster configuration that will be used as the context for template rendering
 class PayLocalCluster {
     name;
     payServices;
     dbServices;
     reverseProxyServices;
-    egressProxy;
     javaApps;
     nodeApps;
     localJavaApps;
@@ -29,6 +29,7 @@ class PayLocalCluster {
     requiresEgressProxy;
     serviceURLEnvVars;
     mountLocalNodeApps;
+    mountPayJSCommons;
     noProxyEnvVar;
     defaultServiceConfigsPath;
     environmentOverridesPath;
@@ -38,7 +39,6 @@ class PayLocalCluster {
         this.payServices = clusterConfig.payServices;
         this.dbServices = clusterConfig.dbServices;
         this.reverseProxyServices = clusterConfig.reverseProxyServices;
-        this.egressProxy = clusterConfig.egressProxy;
         this.javaApps = this.payServices.filter((service) => service.serviceType === PayServiceType.Java);
         this.nodeApps = this.payServices.filter((service) => service.serviceType === PayServiceType.Node);
         this.remoteJavaApps = this.javaApps.filter((service) => service.localBuild);
@@ -49,8 +49,9 @@ class PayLocalCluster {
         this.anyNodeApps = this.nodeApps.length >= 0;
         this.requiresLocalStack = this.payServices.some((service) => service.requiresLocalStack);
         this.requiresRedis = this.payServices.some((service) => service.usesRedis);
-        this.requiresEgressProxy = this.egressProxy !== undefined;
+        this.requiresEgressProxy = clusterConfig.egressProxy;
         this.mountLocalNodeApps = clusterConfig.mountLocalNodeApps;
+        this.mountPayJSCommons = clusterConfig.mountPayJSCommons;
         this.serviceURLEnvVars = [
             this.javaApps.map((javaService) => envVarForJavaService(javaService)),
             this.nodeApps.map((nodeService) => envVarForNodeService(nodeService))
@@ -64,7 +65,7 @@ class PayLocalCluster {
             this.payServices.map((service) => service.name),
             this.dbServices.map((service) => service.name),
             this.reverseProxyServices.map((service) => service.name),
-            this.egressProxy === undefined ? [] : this.egressProxy.name
+            this.requiresEgressProxy ? [] : ['egress']
         ].flat().join(',');
         this.environmentOverridesPath = clusterConfig.environmentOverridesPath;
         this.defaultServiceConfigsPath = clusterConfig.defaultServiceConfigsPath;
@@ -114,9 +115,11 @@ function loadClusterConfig(options, workspace, defaultServiceConfigsPath, enviro
         name: options.cluster,
         payServices,
         dbServices,
+        egressProxy: options.withEgressProxy,
         reverseProxyServices,
         workspace,
-        mountLocalNodeApps: options.mount_local_node_apps,
+        mountLocalNodeApps: options.mountLocalNodeApps,
+        mountPayJSCommons: options.mountPayJSCommons,
         defaultServiceConfigsPath,
         environmentOverridesPath
     };
@@ -170,7 +173,7 @@ function payServiceFromPayServiceConfig(config, upOptions, environmentOverridesP
         hasSNSTopics: snsTopics.length > 0,
         hasProxy: config.proxy === undefined ? false : config.proxy,
         hasDB: config.db,
-        useEgressProxy: config.can_use_egress_proxy === undefined ? false : config.can_use_egress_proxy && upOptions.with_egress_proxy,
+        useEgressProxy: config.can_use_egress_proxy === undefined ? false : config.can_use_egress_proxy && upOptions.withEgressProxy,
         dependsOn: config.db ? [`${config.name}_db`] : [],
         expose: [],
         payServiceConfig: config,

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

@@ -3,9 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const app_client_js_1 = __importDefault(require("../app_client/app_client.js"));
-async function AccountHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'account';
+exports.desc = 'Create a local gateway account';
+const builder = (yargs) => {
+    return yargs.usage(`$0 local account [--service-id <SERVICE_ID>]\n\n${exports.desc}`)
+        .option('service-id', {
+        type: 'string',
+        description: 'ID of an existing service'
+    });
+};
+exports.builder = builder;
+exports.handler = accountHandler;
+async function accountHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const serviceId = argv.serviceId;
     if (await app_client_js_1.default.isUnhealthy('adminusers')) {
         console.error('The adminusers service is unhealthy, so an account cannot be created');
         return;
@@ -14,38 +28,25 @@ async function AccountHandler(options) {
         console.error('The connector service is unhealthy, so an account cannot be created');
         return;
     }
-    let serviceExternalID;
-    if (args.serviceID === undefined) {
-        serviceExternalID = await app_client_js_1.default.createService();
-        if (serviceExternalID === undefined) {
+    let serviceExternalId;
+    if (serviceId === undefined) {
+        serviceExternalId = await app_client_js_1.default.createService();
+        if (serviceExternalId === undefined) {
             console.error('Service creation failed');
             return;
         }
     }
     else {
-        serviceExternalID = args.serviceID;
+        serviceExternalId = serviceId;
     }
-    if (serviceExternalID === undefined) {
+    if (serviceExternalId === undefined) {
         throw new Error('Service external ID is undefined, this should be impossible');
     }
-    const account = await app_client_js_1.default.createAccountInServiceWithEmailCollectionMode(serviceExternalID, 'MANDATORY');
+    const account = await app_client_js_1.default.createAccountInServiceWithEmailCollectionMode(serviceExternalId, 'MANDATORY');
     if (account === undefined) {
         console.error('Failed to create a fully set up account');
         return;
     }
     console.log(account);
 }
-exports.default = AccountHandler;
-function parseArguments(options) {
-    if (options.length === 0) {
-        return {};
-    }
-    if (options.length > 1) {
-        help();
-        throw new Error('Too many arguments');
-    }
-    return { serviceID: options[0] };
-}
-function help() {
-    console.log('Usage: pay local account [service_id]>');
-}
+exports.default = accountHandler;

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

@@ -3,18 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const node_child_process_1 = require("node:child_process");
 const app_client_js_1 = __importDefault(require("../app_client/app_client.js"));
 const pay_local_cluster_js_1 = require("../config/pay_local_cluster.js");
-async function BrowseHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'browse <service>';
+exports.desc = 'Browse to local service';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local browse <service> [--proxy]\n\n${exports.desc}`)
+        .positional('service', {
+        type: 'string',
+        description: 'service'
+    })
+        .option('proxy', {
+        type: 'boolean',
+        default: false,
+        description: 'Opens the service via the local proxy for the service'
+    });
+};
+exports.builder = builder;
+exports.handler = browseHandler;
+async function browseHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const service = argv.service;
+    const proxy = argv.proxy;
     const servicesConfig = (0, pay_local_cluster_js_1.loadServicesConfig)();
-    if (!(args.service in servicesConfig)) {
-        console.error(`The service specified (${args.service}) was not defined in the service_config.yaml file`);
+    if (!(service in servicesConfig)) {
+        console.error(`The service specified (${service}) was not defined in the service_config.yaml file`);
         return;
     }
-    const serviceConfig = servicesConfig[args.service];
-    const url = app_client_js_1.default.externalUrlFor(args.service, '/', args.proxy);
+    const serviceConfig = servicesConfig[service];
+    const url = app_client_js_1.default.externalUrlFor(service, '/', proxy);
     (0, node_child_process_1.spawn)('open', [url]);
     if (await app_client_js_1.default.isHealthy(serviceConfig.name)) {
         console.log(`📋 “${url}” opened`);
@@ -23,17 +44,4 @@ async function BrowseHandler(options) {
         console.error(`❌ “${url}” opened, however the app did not respond successfully to ${url}/healthcheck`);
     }
 }
-exports.default = BrowseHandler;
-function help() {
-    console.log('Usage: pay local browse <service>');
-}
-function parseArguments(options) {
-    if (options.length !== 1) {
-        help();
-        throw new Error('No service specified');
-    }
-    return {
-        service: options[0],
-        proxy: true
-    };
-}
+exports.default = browseHandler;

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

@@ -1,20 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const node_child_process_1 = require("node:child_process");
 const pay_local_cluster_js_1 = require("../config/pay_local_cluster.js");
-async function DBHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'db <app_name>';
+exports.desc = 'Connect to <app_name> database';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local db <app_name> [--docker]\n\n${exports.desc}`)
+        .positional('app_name', {
+        type: 'string',
+        description: 'service'
+    })
+        .option('docker', {
+        type: 'boolean',
+        default: false,
+        description: 'Launch psql inside the apps database container (no psql history)'
+    });
+};
+exports.builder = builder;
+exports.handler = dbHandler;
+async function dbHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const service = argv.app_name;
+    const docker = argv.docker;
     const servicesConfig = (0, pay_local_cluster_js_1.loadServicesConfig)();
-    if (!(args.service in servicesConfig)) {
-        console.error(`The service specified (${args.service}) was not defined in the service_config.yaml file`);
+    if (!(service in servicesConfig)) {
+        console.error(`The service specified (${service}) was not defined in the service_config.yaml file`);
         return;
     }
-    const serviceConfig = servicesConfig[args.service];
+    const serviceConfig = servicesConfig[service];
     if (!serviceConfig.db) {
         console.error(`The service specified (${serviceConfig.name}) does not have a database`);
         return;
     }
-    if (args.docker) {
+    if (docker) {
         launchPsqlInDocker(serviceConfig);
     }
     else if (!psqlAvailable()) {
@@ -25,7 +46,7 @@ async function DBHandler(options) {
         launchPsql(serviceConfig);
     }
 }
-exports.default = DBHandler;
+exports.default = dbHandler;
 function psqlAvailable() {
     const psqlCheck = (0, node_child_process_1.spawnSync)('command', ['-v', 'psql'], { shell: true });
     if (psqlCheck.status === 0) {
@@ -67,16 +88,3 @@ function launchPsql(serviceConfig) {
         }
     });
 }
-function help() {
-    console.log('Usage: pay local db <service> [--docker]');
-}
-function parseArguments(options) {
-    if (options.length !== 1) {
-        help();
-        throw new Error('No service specified');
-    }
-    return {
-        service: options[0],
-        docker: false
-    };
-}