@govuk-pay/cli 0.0.32 → 0.0.34

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

@@ -3,34 +3,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.composeFileToDown = exports.ENVIRONMENT_OVERRIDES_PATH = exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = void 0;
+exports.composeFileToDown = exports.handler = exports.builder = exports.desc = exports.command = exports.ENVIRONMENT_OVERRIDES_PATH = exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const configs_js_1 = require("../../../util/configs.js");
 const last_up_record_js_1 = require("../config/last_up_record.js");
 const docker_compose_controller_js_1 = __importDefault(require("../docker_compose_controller.js"));
+const pay_local_cluster_js_1 = require("../config/pay_local_cluster.js");
+const standardContent_1 = require("../../../core/standardContent");
 exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = node_path_1.default.join('local', 'docker-compose', 'rendered-templates');
 exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = node_path_1.default.join('local', 'docker-compose', 'default-configs-DO-NOT-EDIT');
 exports.ENVIRONMENT_OVERRIDES_PATH = node_path_1.default.join('local', 'environment-overrides');
-async function DownHandler(options) {
+exports.command = 'down';
+exports.desc = 'Bring down a cluster';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local down [--cluster <cluster>]\n\n${exports.desc}`)
+        .option('cluster', {
+        type: 'string',
+        description: 'Cluster to bring down',
+        choices: pay_local_cluster_js_1.CLUSTERS
+    });
+};
+exports.builder = builder;
+exports.handler = downHandler;
+async function downHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const { cluster } = argv;
     const renderedTempaltesPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH);
-    const args = parseArguments(options);
-    const composeFilePath = composeFileToDown(args, renderedTempaltesPath);
+    const composeFilePath = composeFileToDown(cluster, renderedTempaltesPath);
     const composeFileName = node_path_1.default.basename(composeFilePath);
     const clusterToDown = composeFileName.substring(0, composeFileName.lastIndexOf('.yaml'));
     console.log(`Bringing down cluster ${clusterToDown}`);
     docker_compose_controller_js_1.default.down(composeFilePath);
 }
-exports.default = DownHandler;
-function composeFileToDown(downOptions, renderedTemplatesPath) {
-    if (downOptions.cluster !== undefined) {
-        const clusterFilePath = node_path_1.default.resolve(renderedTemplatesPath, `${downOptions.cluster}.yaml`);
+exports.default = downHandler;
+function composeFileToDown(cluster, renderedTemplatesPath) {
+    if (cluster !== undefined) {
+        const clusterFilePath = node_path_1.default.resolve(renderedTemplatesPath, `${cluster}.yaml`);
         if (node_fs_1.default.existsSync(clusterFilePath)) {
             return clusterFilePath;
         }
-        throw new Error(`Cannot bring down cluster '${downOptions.cluster}' since it does not have a rendered docker-compose template in ${renderedTemplatesPath}.\n` +
+        throw new Error(`Cannot bring down cluster '${cluster}' since it does not have a rendered docker-compose template in ${renderedTemplatesPath}.\n` +
             '\n' +
-            `Perhaps you don't have a cluster running, or the cluster that is running isn't ${downOptions.cluster}\n`);
+            `Perhaps you don't have a cluster running, or the cluster that is running isn't ${cluster}\n`);
     }
     const mostRecentUpFile = (0, last_up_record_js_1.getLastUp)(renderedTemplatesPath);
     if (mostRecentUpFile !== undefined) {
@@ -49,8 +65,3 @@ function composeFileToDown(downOptions, renderedTemplatesPath) {
         'Perhaps you do not have a running cluster, or you need to `pay local down --cluster <cluster>` specifying the last cluster you launched\n');
 }
 exports.composeFileToDown = composeFileToDown;
-function parseArguments(_options) {
-    return {
-        cluster: 'card'
-    };
-}

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

@@ -3,26 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENVIRONMENT_OVERRIDES_PATH = exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = void 0;
+exports.handler = exports.desc = exports.command = exports.ENVIRONMENT_OVERRIDES_PATH = exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = void 0;
 const up_js_1 = __importDefault(require("./up.js"));
 const node_path_1 = __importDefault(require("node:path"));
 const docker_compose_controller_js_1 = __importDefault(require("../docker_compose_controller.js"));
+const standardContent_1 = require("../../../core/standardContent");
 exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = node_path_1.default.join('local', 'docker-compose', 'rendered-templates');
 exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = node_path_1.default.join('local', 'docker-compose', 'default-configs-DO-NOT-EDIT');
 exports.ENVIRONMENT_OVERRIDES_PATH = node_path_1.default.join('local', 'environment-overrides');
-async function NukeHandler() {
+exports.command = 'nuke';
+exports.desc = 'Kill and completely destroy all containers previously started by pay local';
+exports.handler = nukeHandler;
+async function nukeHandler(argv) {
+    await (0, standardContent_1.showHeader)();
     const upOptions = {
         cluster: 'nuke',
         proxy: true,
-        with_egress_proxy: true,
+        withEgressProxy: true,
         apps: [],
         local: [],
         rebuild: false,
         pull: false,
-        mount_local_node_apps: false
+        mountLocalNodeApps: false,
+        mountPayJSCommons: false
     };
     const renderedTemplatePath = await (0, up_js_1.default)(upOptions, true);
     console.log('Nuking cluster');
     docker_compose_controller_js_1.default.nuke(renderedTemplatePath);
 }
-exports.default = NukeHandler;
+exports.default = nukeHandler;

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

@@ -1,27 +1,29 @@
 "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 totp_generator_1 = require("totp-generator");
-async function OTPHandler(options) {
-    const args = parseArguments(options);
-    const { otp } = totp_generator_1.TOTP.generate(args.secret);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'opt <key>';
+exports.desc = 'Create otp code';
+const builder = (yargs) => {
+    return yargs.positional('key', {
+        type: 'string',
+        description: 'otp key'
+    });
+};
+exports.builder = builder;
+exports.handler = otpHandler;
+async function otpHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const { otp } = totp_generator_1.TOTP.generate(argv.key);
     console.log(otp);
     copyToClipboard(otp);
     console.log(`📋 “${otp}” copied to clipboard`);
 }
-exports.default = OTPHandler;
-function parseArguments(options) {
-    if (options.length !== 1) {
-        help();
-        throw new Error('No key specified');
-    }
-    return { secret: options[0].trimEnd() };
-}
+exports.default = otpHandler;
 function copyToClipboard(otp) {
     const proc = (0, node_child_process_1.spawn)('pbcopy');
     proc.stdin.write(otp);
     proc.stdin.end();
 }
-function help() {
-    console.log('Usage: pay local otp <otp_secret_key>');
-}

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

@@ -3,10 +3,30 @@ 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"));
-async function PaymentHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'payment';
+exports.desc = 'Create a payment';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local payment [--api-key <api-key>] [--email-collection-mode <email-collection-mode>]\n\n${exports.desc}`)
+        .option('api-key', {
+        type: 'string',
+        description: 'API Key'
+    }).option('email-collection-mode', {
+        type: 'string',
+        default: 'MANDATORY',
+        choices: ['MANDATORY', 'OPTIONAL', 'OFF'],
+        description: 'Email collection mode to use'
+    });
+};
+exports.builder = builder;
+exports.handler = paymentHandler;
+async function paymentHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    let apiKey = argv.apiKey;
     if (await app_client_js_1.default.isUnhealthy('connector')) {
         console.error('The connector service is unhealthy, so a payment cannot be created');
         return;
@@ -15,8 +35,7 @@ async function PaymentHandler(options) {
         console.error('The publicapi service is unhealthy, so a payment cannot be created');
         return;
     }
-    let apiKey;
-    if (args.api_key === undefined) {
+    if (apiKey === undefined) {
         console.warn('👔  Creating gateway account and service');
         console.warn();
         if (await app_client_js_1.default.isUnhealthy('adminusers')) {
@@ -28,7 +47,7 @@ async function PaymentHandler(options) {
             console.error('Unable to create a service');
             return;
         }
-        const account = await app_client_js_1.default.createAccountInServiceWithEmailCollectionMode(serviceExternalID, args.email_collection_mode === undefined ? 'MANDATORY' : args.email_collection_mode);
+        const account = await app_client_js_1.default.createAccountInServiceWithEmailCollectionMode(serviceExternalID, argv.emailCollectionMode);
         if (account === undefined) {
             console.error('Failed to create a fully set up account');
             return;
@@ -43,9 +62,6 @@ async function PaymentHandler(options) {
         console.warn(`💁  Service ID: ${serviceExternalID}`);
         console.warn();
     }
-    else {
-        apiKey = args.api_key;
-    }
     const createPaymentResult = await app_client_js_1.default.createPayment(apiKey);
     if (createPaymentResult === undefined) {
         console.error('Failed to create a payment');
@@ -62,7 +78,4 @@ async function PaymentHandler(options) {
     console.log(`Opening next_url (${nextUrl} in your browser`);
     (0, node_child_process_1.spawn)('open', [nextUrl]);
 }
-exports.default = PaymentHandler;
-function parseArguments(_options) {
-    return {};
-}
+exports.default = paymentHandler;

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

@@ -3,10 +3,26 @@ 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 = __importDefault(require("node:child_process"));
 const app_client_js_1 = __importDefault(require("../app_client/app_client.js"));
-async function PaymentLinkHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'paymentlink';
+exports.desc = 'Create a payment link';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local paymentlink --api-key <api-key>\n\n${exports.desc}`)
+        .option('api-key', {
+        demandOption: true,
+        type: 'string',
+        description: 'API Key'
+    });
+};
+exports.builder = builder;
+exports.handler = paymentLinkHandler;
+async function paymentLinkHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const apiKey = argv.apiKey;
     if (await app_client_js_1.default.isUnhealthy('products')) {
         console.error('The products service is unhealthy, so a payment link cannot be created');
         return;
@@ -15,7 +31,7 @@ async function PaymentLinkHandler(options) {
         console.error('The products-ui service is unhealthy, so a payment link cannot be created');
         return;
     }
-    const paymentLinks = await app_client_js_1.default.createPaymentLink(args.apiKey);
+    const paymentLinks = await app_client_js_1.default.createPaymentLink(apiKey);
     if (paymentLinks === undefined) {
         console.error('Payment link creation failed');
         return;
@@ -28,14 +44,4 @@ async function PaymentLinkHandler(options) {
     }
     node_child_process_1.default.spawn('open', [payLink.href]);
 }
-exports.default = PaymentLinkHandler;
-function parseArguments(options) {
-    if (options.length !== 1) {
-        help();
-        throw new Error('No key specified');
-    }
-    return { apiKey: options[0].trimEnd() };
-}
-function help() {
-    console.log('Usage: pay local paymentlink <api_key>');
-}
+exports.default = paymentLinkHandler;

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

@@ -3,33 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = void 0;
+exports.handler = exports.builder = exports.desc = exports.command = exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const configs_js_1 = require("../../../util/configs.js");
 const last_up_record_js_1 = require("../config/last_up_record.js");
 const docker_compose_controller_js_1 = __importDefault(require("../docker_compose_controller.js"));
-exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = node_path_1.default.join('local', 'docker-compose', 'rendered-templates');
-async function DownHandler(options) {
-    const renderedTempaltesPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH);
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH = node_path_1.default.join('local', 'docker-compose', 'rendered-templates');
+exports.command = 'restart <app>';
+exports.desc = 'Restart a container and waits for it to be healthy';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local restart <app>\n\n${exports.desc}`)
+        .positional('app', {
+        type: 'string',
+        description: 'App to restart'
+    });
+};
+exports.builder = builder;
+exports.handler = restartHandler;
+async function restartHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const service = argv.app;
+    const renderedTempaltesPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH);
     const composeFilePath = (0, last_up_record_js_1.getLastUp)(renderedTempaltesPath);
     if (composeFilePath === undefined) {
         throw new Error('Cannot find the docker-compose file for the running cluster');
     }
     const composeFileName = node_path_1.default.basename(composeFilePath);
     const clusterName = composeFileName.substring(0, composeFileName.lastIndexOf('.yaml'));
-    console.log(`\nRestarting '${args.service} in cluster ${clusterName}`);
-    docker_compose_controller_js_1.default.restart(composeFilePath, args.service);
-}
-exports.default = DownHandler;
-function parseArguments(options) {
-    if (options.length !== 1) {
-        throw new Error('Incorrect number of arguments, expected 1 to restart command\n' +
-            '\n' +
-            '  Usage: pay local restart <service>\n' +
-            '\n');
-    }
-    return {
-        service: options[0]
-    };
+    console.log(`\nRestarting '${service} in cluster ${clusterName}`);
+    docker_compose_controller_js_1.default.restart(composeFilePath, service);
 }
+exports.default = restartHandler;

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

@@ -3,16 +3,30 @@ 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"));
-async function TokenHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'token';
+exports.desc = 'Create a token';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local token [--gateway-account-id <gateway-account-id>]\n\n${exports.desc}`)
+        .option('gateway-account-id', {
+        type: 'string',
+        description: 'ID of the gateway account'
+    });
+};
+exports.builder = builder;
+exports.handler = tokenHandler;
+async function tokenHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    let gatewayAccountID = argv.gatewayAccountID;
     if (await app_client_js_1.default.isUnhealthy('publicauth')) {
         console.error('The publicauth service is unhealthy, so an API token cannot be created');
         return;
     }
-    let gatewayAccountID;
-    if (args.gatewayAccountID === undefined) {
+    if (gatewayAccountID === undefined) {
         console.log('No gateway_account_id provided, creating service and gateway account');
         if (await app_client_js_1.default.isUnhealthy('adminusers')) {
             console.error('The adminusers service is unhealthy, so an API token cannot be created');
@@ -34,9 +48,6 @@ async function TokenHandler(options) {
         }
         gatewayAccountID = account.gateway_account_id;
     }
-    else {
-        gatewayAccountID = args.gatewayAccountID;
-    }
     const token = await app_client_js_1.default.createToken(gatewayAccountID);
     if (token === undefined) {
         console.error('Failed to create an API token');
@@ -45,22 +56,9 @@ async function TokenHandler(options) {
     copyToClipboard(token);
     console.log(`📋 API token “${token}” copied to clipboard`);
 }
-exports.default = TokenHandler;
-function parseArguments(options) {
-    if (options.length === 0) {
-        return {};
-    }
-    if (options.length > 1) {
-        help();
-        throw new Error('Too many arguments');
-    }
-    return { gatewayAccountID: options[0] };
-}
+exports.default = tokenHandler;
 function copyToClipboard(token) {
     const proc = (0, node_child_process_1.spawn)('pbcopy');
     proc.stdin.write(token);
     proc.stdin.end();
 }
-function help() {
-    console.log('Usage: pay local token [gateway_account_id]>');
-}

package/src/commands/local/subcommands/up.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.ENVIRONMENT_OVERRIDES_PATH = exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = void 0;
+exports.upCommandHandler = exports.handler = exports.builder = exports.desc = exports.command = exports.ENVIRONMENT_OVERRIDES_PATH = exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH = void 0;
 const path_1 = __importDefault(require("path"));
 const docker_compose_controller_js_1 = __importDefault(require("../docker_compose_controller.js"));
 const configs_js_1 = require("../../../util/configs.js");
@@ -11,28 +11,98 @@ const pay_local_cluster_js_1 = require("../config/pay_local_cluster.js");
 const renderer_js_1 = require("../config/renderer.js");
 const last_up_record_js_1 = require("../config/last_up_record.js");
 const default_config_setup_js_1 = require("../config/default_config_setup.js");
-exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH = path_1.default.join('local', 'docker-compose', 'rendered-templates');
+const standardContent_1 = require("../../../core/standardContent");
+exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH = path_1.default.join('local', 'docker-compose', 'rendered-templates');
 exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH = path_1.default.join('local', 'docker-compose', 'default-configs-DO-NOT-EDIT');
 exports.ENVIRONMENT_OVERRIDES_PATH = path_1.default.join('local', 'environment-overrides');
+exports.command = ['up', 'launch'];
+exports.desc = 'Launch a predefined cluster, or a user specified list of apps.';
+const builder = (yargs) => {
+    return 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: pay_local_cluster_js_1.CLUSTERS,
+        default: 'all',
+        description: 'cluster'
+    })
+        .option('apps', {
+        type: 'array',
+        default: [],
+        description: ''
+    })
+        .option('local', {
+        type: 'array',
+        default: [],
+        description: ''
+    })
+        .option('proxy', {
+        type: 'boolean',
+        default: false,
+        description: ''
+    })
+        .option('with-egress-proxy', {
+        type: 'boolean',
+        default: false,
+        description: ''
+    })
+        .option('rebuild', {
+        type: 'boolean',
+        default: true,
+        description: ''
+    })
+        .option('pull', {
+        type: 'boolean',
+        default: true,
+        description: ''
+    })
+        .option('mount-local-node-apps', {
+        type: 'boolean',
+        default: false,
+        description: ''
+    })
+        .option('mount-pay-js-commons', {
+        type: 'boolean',
+        default: false,
+        description: 'If mount local node apps is also specified this will mount pay-js-commons into /pay-js-commons in the node containers'
+    });
+};
+exports.builder = builder;
+exports.handler = upCommandHandler;
+async function upCommandHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const upOptions = {
+        cluster: argv.cluster,
+        proxy: argv.proxy,
+        withEgressProxy: argv.withEgressProxy,
+        apps: argv.apps,
+        local: argv.local,
+        rebuild: argv.rebuild,
+        pull: argv.pull,
+        mountLocalNodeApps: argv.mountLocalNodeApps,
+        mountPayJSCommons: argv.mountPayJsCommons
+    };
+    await UpHandler(upOptions, false);
+}
+exports.upCommandHandler = upCommandHandler;
 async function UpHandler(options, onlyWriteConfig = false) {
     const workspace = (0, configs_js_1.workspaceEnvVar)();
-    const renderedTemplatesPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_RENDERED_TEMPALTES_PATH);
+    const renderedTemplatesPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH);
     const composeServicesConfigPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_SERVICES_CONFIG_PATH);
     const environmentOverridesPath = (0, configs_js_1.ensureConfigDirectory)(exports.ENVIRONMENT_OVERRIDES_PATH);
     (0, default_config_setup_js_1.copyDefaultConfigs)(composeServicesConfigPath);
-    const args = options instanceof Array ? parseArguments(options) : options;
-    const clusterConfig = (0, pay_local_cluster_js_1.loadClusterConfig)(args, workspace, composeServicesConfigPath, environmentOverridesPath);
+    const clusterConfig = (0, pay_local_cluster_js_1.loadClusterConfig)(options, workspace, composeServicesConfigPath, environmentOverridesPath);
     const renderedTemplatePath = (0, renderer_js_1.renderDockerCompose)(clusterConfig, renderedTemplatesPath);
     console.log(`docker-compose yaml written to ${renderedTemplatePath}`);
     (0, last_up_record_js_1.recordUp)(renderedTemplatesPath, clusterConfig);
     if (onlyWriteConfig) {
         return renderedTemplatePath;
     }
-    if (args.pull) {
+    if (options.pull) {
         console.log(`\nPulling containers for cluster ${clusterConfig.name}`);
         docker_compose_controller_js_1.default.pull(renderedTemplatePath);
     }
-    if (args.local.length > 0 && args.rebuild) {
+    if (options.local.length > 0 && options.rebuild) {
         console.log(`\nBuilding all local apps for cluster ${clusterConfig.name}`);
         docker_compose_controller_js_1.default.build(renderedTemplatePath);
     }
@@ -41,15 +111,3 @@ async function UpHandler(options, onlyWriteConfig = false) {
     return renderedTemplatePath;
 }
 exports.default = UpHandler;
-function parseArguments(_options) {
-    return {
-        cluster: 'all',
-        apps: [],
-        local: [], // ['cardid', 'frontend'],
-        proxy: true,
-        with_egress_proxy: false,
-        rebuild: true,
-        pull: true,
-        mount_local_node_apps: false
-    };
-}

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

@@ -3,18 +3,36 @@ 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 URLHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'url <service>';
+exports.desc = 'Copy base URL of local service to clipboard';
+const builder = (yargs) => {
+    return yargs.positional('service', {
+        type: 'string',
+        description: 'service'
+    }).option('proxy', {
+        type: 'boolean',
+        default: false,
+        description: 'Something about proxy'
+    });
+};
+exports.builder = builder;
+exports.handler = urlHandler;
+async function urlHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const service = argv.service;
+    const proxy = argv.service;
     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);
     copyToClipboard(url);
     if (await app_client_js_1.default.isHealthy(serviceConfig.name)) {
         console.log(`📋 “${url}” copied to clipboard`);
@@ -23,22 +41,9 @@ async function URLHandler(options) {
         console.error(`❌ “${url}” copied to clipboard, however the app did not respond successfully to ${url}/healthcheck`);
     }
 }
-exports.default = URLHandler;
+exports.default = urlHandler;
 function copyToClipboard(url) {
     const proc = (0, node_child_process_1.spawn)('pbcopy');
     proc.stdin.write(url);
     proc.stdin.end();
 }
-function help() {
-    console.log('Usage: pay local url <service>');
-}
-function parseArguments(options) {
-    if (options.length !== 1) {
-        help();
-        throw new Error('No service specified');
-    }
-    return {
-        service: options[0],
-        proxy: false
-    };
-}

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

@@ -3,11 +3,27 @@ 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"));
 const totp_generator_1 = require("totp-generator");
 const node_child_process_1 = require("node:child_process");
-async function UserHandler(options) {
-    const args = parseArguments(options);
+const standardContent_1 = require("../../../core/standardContent");
+exports.command = 'user';
+exports.desc = 'Create a local user';
+const builder = (yargs) => {
+    return yargs
+        .usage(`$0 local user [--create-payments]\n\n${exports.desc}`)
+        .option('create-payments', {
+        type: 'boolean',
+        default: false,
+        description: 'Create payments'
+    });
+};
+exports.builder = builder;
+exports.handler = userHandler;
+async function userHandler(argv) {
+    await (0, standardContent_1.showHeader)();
+    const createPayments = argv.createPayments;
     if (await app_client_js_1.default.isUnhealthy('adminusers')) {
         console.error('The adminusers service is unhealthy, so a user cannot be created');
         return;
@@ -32,7 +48,7 @@ async function UserHandler(options) {
         console.error('Failed to create an API token');
         return;
     }
-    if (args.createPayments !== undefined && args.createPayments) {
+    if (createPayments !== undefined && createPayments) {
         console.warn('💸  Creating 10 payments in card sandbox gateway account (each . is a success, each ! is a failure)');
         let createPaymentResult;
         for (let i = 0; i < 10; i++) {
@@ -78,14 +94,9 @@ async function UserHandler(options) {
     console.log();
     (0, node_child_process_1.spawn)('open', [selfserviceUrl]);
 }
-exports.default = UserHandler;
+exports.default = userHandler;
 function copyToClipboard(email) {
     const proc = (0, node_child_process_1.spawn)('pbcopy');
     proc.stdin.write(email);
     proc.stdin.end();
 }
-function parseArguments(_options) {
-    return {
-        createPayments: false
-    };
-}