@govuk-pay/cli 0.0.32 → 0.0.33

package/src/commands/local.js

@@ -1,136 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const standardContent_js_1 = require("../core/standardContent.js");
-const otp_js_1 = __importDefault(require("./local/subcommands/otp.js"));
-const up_js_1 = __importDefault(require("./local/subcommands/up.js"));
-const down_js_1 = __importDefault(require("./local/subcommands/down.js"));
-const nuke_js_1 = __importDefault(require("./local/subcommands/nuke.js"));
-const restart_js_1 = __importDefault(require("./local/subcommands/restart.js"));
-const paymentlink_js_1 = __importDefault(require("./local/subcommands/paymentlink.js"));
-const url_js_1 = __importDefault(require("./local/subcommands/url.js"));
-const browse_js_1 = __importDefault(require("./local/subcommands/browse.js"));
-const db_js_1 = __importDefault(require("./local/subcommands/db.js"));
-const account_js_1 = __importDefault(require("./local/subcommands/account.js"));
-const token_js_1 = __importDefault(require("./local/subcommands/token.js"));
-const payment_js_1 = __importDefault(require("./local/subcommands/payment.js"));
-const user_js_1 = __importDefault(require("./local/subcommands/user.js"));
-var LocalCommand;
-(function (LocalCommand) {
-    LocalCommand["OTP"] = "otp";
-    LocalCommand["Up"] = "up";
-    LocalCommand["Launch"] = "launch";
-    LocalCommand["Down"] = "down";
-    LocalCommand["Restart"] = "restart";
-    LocalCommand["Nuke"] = "nuke";
-    LocalCommand["PaymentLink"] = "paymentlink";
-    LocalCommand["Browse"] = "browse";
-    LocalCommand["Url"] = "url";
-    LocalCommand["DB"] = "db";
-    LocalCommand["Token"] = "token";
-    LocalCommand["Payment"] = "payment";
-    LocalCommand["Account"] = "account";
-    LocalCommand["User"] = "user";
-    LocalCommand["Help"] = "help";
-    LocalCommand["Unknown"] = "Unknown";
-})(LocalCommand || (LocalCommand = {}));
-async function localHandler(options) {
-    await (0, standardContent_js_1.showHeader)();
-    const { subcommand, subcommandOptions } = parseArguments(options);
-    switch (subcommand) {
-        case LocalCommand.OTP: {
-            await (0, otp_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.PaymentLink: {
-            await (0, paymentlink_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Browse: {
-            await (0, browse_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Account: {
-            await (0, account_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Url: {
-            await (0, url_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.DB: {
-            await (0, db_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Token: {
-            await (0, token_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Payment: {
-            await (0, payment_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.User: {
-            await (0, user_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Up: {
-            await (0, up_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Launch: {
-            await (0, up_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Down: {
-            await (0, down_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Restart: {
-            await (0, restart_js_1.default)(subcommandOptions);
-            break;
-        }
-        case LocalCommand.Nuke: {
-            await (0, nuke_js_1.default)();
-            break;
-        }
-        case LocalCommand.Help:
-        case LocalCommand.Unknown: {
-            help();
-            break;
-        }
-        default: {
-            help();
-            break;
-        }
-    }
-}
-exports.default = localHandler;
-// TODO: Replace this with yargs
-function parseArguments(options) {
-    const subcommandOptions = options.arguments;
-    const subcommand = subcommandOptions.shift();
-    switch (subcommand) {
-        case LocalCommand.OTP: return { subcommand, subcommandOptions };
-        case LocalCommand.PaymentLink: return { subcommand, subcommandOptions };
-        case LocalCommand.Url: return { subcommand, subcommandOptions };
-        case LocalCommand.Browse: return { subcommand, subcommandOptions };
-        case LocalCommand.Account: return { subcommand, subcommandOptions };
-        case LocalCommand.Up: return { subcommand, subcommandOptions };
-        case LocalCommand.DB: return { subcommand, subcommandOptions };
-        case LocalCommand.Token: return { subcommand, subcommandOptions };
-        case LocalCommand.Payment: return { subcommand, subcommandOptions };
-        case LocalCommand.User: return { subcommand, subcommandOptions };
-        case LocalCommand.Launch: return { subcommand, subcommandOptions };
-        case LocalCommand.Down: return { subcommand, subcommandOptions };
-        case LocalCommand.Restart: return { subcommand, subcommandOptions };
-        case LocalCommand.Nuke: return { subcommand, subcommandOptions };
-        case LocalCommand.Help: return { subcommand, subcommandOptions };
-        default: return { subcommand: LocalCommand.Unknown, subcommandOptions };
-    }
-}
-function help() {
-    console.error('USAGE FOLLOWS');
-}
+exports.builder = exports.desc = exports.command = void 0;
+exports.command = 'local';
+exports.desc = 'Local pay for local people';
+const builder = (yargs) => {
+    return yargs
+        .commandDir('local/subcommands')
+        .demandCommand();
+};
+exports.builder = builder;

package/src/commands/tunnel.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.logTunnelCommands = void 0;
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const standardContent_js_1 = require("../core/standardContent.js");
 const client_ec2_1 = require("@aws-sdk/client-ec2");
 const client_ecs_1 = require("@aws-sdk/client-ecs");
@@ -24,12 +24,19 @@ const FORMAT = {
     ul: '\x1b[4m',
     ulstop: '\x1b[24m'
 };
-function logTunnelCommands() {
-    console.log(`Commands:
-    pay tunnel <ENVIRONMENT> <APP-NAME> # Open tunnel to application <APP-NAME> database in specified environment <ENVIRONMENT>
-    pay tunnel help                     # Describe tunnel command`);
-}
-exports.logTunnelCommands = logTunnelCommands;
+exports.command = 'tunnel <environment> <application>';
+exports.desc = 'Open a tunnel to an app database in a given environment';
+const builder = (yargs) => {
+    return yargs.positional('environment', {
+        describe: 'The environment to open the tunnel to',
+        choices: constants_js_1.ENVIRONMENTS
+    }).positional('application', {
+        describe: 'The application to connect to',
+        choices: constants_js_1.APPLICATIONS
+    });
+};
+exports.builder = builder;
+exports.handler = tunnelHandler;
 async function readInputForReadOrWriteDBAccess() {
     const rl = promises_1.default.createInterface({
         input: process.stdin,
@@ -54,9 +61,10 @@ async function readInputForReadOrWriteDBAccess() {
         process.exit(1);
     }
 }
-async function tunnelHandler(options) {
+async function tunnelHandler(argv) {
     await (0, standardContent_js_1.showHeader)();
-    const { environment, application } = parseArguments(options);
+    const environment = argv.environment;
+    const application = argv.application;
     console.log(`Opening a database tunnel to ${environment} ${application}`);
     ec2 = new client_ec2_1.EC2Client();
     ecs = new client_ecs_1.ECSClient();
@@ -84,25 +92,6 @@ async function tunnelHandler(options) {
     }
 }
 exports.default = tunnelHandler;
-function parseArguments(options) {
-    if (options.arguments.length !== 2 || options.arguments[0] === 'help') {
-        logTunnelCommands();
-        process.exit(0);
-    }
-    const environment = options.arguments[0];
-    const application = options.arguments[1];
-    if (!constants_js_1.APPLICATIONS.includes(application)) {
-        printError(`Invalid application: "${application}". Must be one of ${constants_js_1.APPLICATIONS.join(', ')}`);
-        process.exit(2);
-    }
-    if (!constants_js_1.ENVIRONMENTS.includes(environment)) {
-        printError(`Invalid environment: "${environment}". Must be one of ${constants_js_1.ENVIRONMENTS.join(', ')}`);
-        process.exit(2);
-    }
-    return {
-        environment, application
-    };
-}
 async function waitForExit() {
     const prompt = "\nTo shutdown bastion task and close tunnel type 'exit' or 'Ctrl-C'\n";
     const rl = readline_1.default.createInterface({

package/src/core/commandRouter.js

@@ -3,81 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const standardContent_js_1 = require("./standardContent.js");
-const browse_js_1 = __importDefault(require("../commands/browse.js"));
-const demo_js_1 = __importDefault(require("../commands/demo.js"));
-const legacy_1 = __importDefault(require("../commands/legacy"));
-const local_js_1 = __importDefault(require("../commands/local.js"));
-const help_1 = __importDefault(require("../commands/help"));
-const tunnel_js_1 = __importDefault(require("../commands/tunnel.js"));
 const package_json_1 = __importDefault(require("../../package.json"));
 const semver_1 = __importDefault(require("semver"));
-const handlers = new Map();
-handlers.set('browse', {
-    handler: browse_js_1.default
-});
-handlers.set('tunnel', {
-    handler: tunnel_js_1.default
-});
-handlers.set('legacy', {
-    handler: legacy_1.default
-});
-handlers.set('doctor', {
-    handler: legacy_1.default
-});
-handlers.set('help', {
-    handler: help_1.default
-});
-handlers.set('local', {
-    handler: legacy_1.default
-});
-handlers.set('localx', {
-    handler: local_js_1.default
-});
-handlers.set('schema', {
-    handler: legacy_1.default
-});
-handlers.set('secrets', {
-    handler: legacy_1.default
-});
-handlers.set('demo', {
-    handler: demo_js_1.default
-});
+const yargs_1 = __importDefault(require("yargs/yargs"));
+const helpers_1 = require("yargs/helpers");
 async function runCommand() {
-    const command = process.argv[2];
     await checkVersion();
-    await showUsageIfNoCommand(command);
-    const commandDetails = await getCommandDetails(command);
-    if (commandDetails === undefined) {
-        console.error(`No command found for [${command}]`);
-        process.exit(10);
-    }
-    await runHandler(command, commandDetails);
+    const yargsInstance = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv));
+    await yargsInstance
+        .commandDir('../commands', { exclude: /.*\.spec\..*/ })
+        .demandCommand()
+        .usage('pay <command>\n\nProvides usefull commands for managing and developing the GOV.UK Pay platform. Use `pay <command> help` to find more information on an individual pay command.')
+        .strict()
+        .help()
+        .wrap(yargsInstance.terminalWidth())
+        .parse();
 }
 exports.default = runCommand;
-async function getCommandDetails(commandName) {
-    return handlers.get(commandName);
-}
-async function showUsageIfNoCommand(commandName) {
-    if (commandName === undefined || commandName.trim() === '') {
-        await (0, standardContent_js_1.showHeader)();
-        await (0, standardContent_js_1.showUsage)();
-        process.exit(2);
-    }
-}
-async function runHandler(commandName, commandHandler) {
-    try {
-        await commandHandler.handler({
-            commandName,
-            arguments: process.argv.slice(3)
-        });
-    }
-    catch (e) {
-        console.error(`Failed to run command [${commandName}]`);
-        console.error(e);
-        process.exit(12);
-    }
-}
 async function checkVersion() {
     try {
         const { version: currentVersion, engines: { node: requiredNodeVersion } } = package_json_1.default;

package/src/core/standardContent.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showUsage = exports.showHeader = void 0;
+exports.showHeader = void 0;
 const fsp = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const constants_js_1 = require("./constants.js");
@@ -31,7 +31,3 @@ async function showHeader() {
     console.log(await fsp.readFile(path.join(constants_js_1.rootDir, 'resources/header.txt'), 'utf8'));
 }
 exports.showHeader = showHeader;
-async function showUsage() {
-    console.log(await fsp.readFile(path.join(constants_js_1.rootDir, 'resources/usageDetails.txt'), 'utf8'));
-}
-exports.showUsage = showUsage;

package/resources/usageDetails.txt

@@ -1,9 +0,0 @@
-Commands:
-  pay browse                   # Opens web browser link to useful links
-  pay doctor                   # Attempts to initialise or fix the Pay CLI
-  pay help [COMMAND]           # Describe available commands or one specific ...
-  pay local                    # Sets up local Pay development environment
-  pay localx                   # EXPERIMENTAL: Nodejs replacement of `pay local`
-  pay schema                   # Generates web based database diagrams and me...
-  pay secrets                  # Manage secrets in and between environments
-  pay tunnel                   # Open tunnel to application database

package/src/commands/help.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const legacy_1 = require("./legacy");
-const standardContent_1 = require("../core/standardContent");
-const browse_1 = require("./browse");
-async function helpHandler(options) {
-    if (options.arguments[0] === 'browse') {
-        await (0, standardContent_1.showHeader)();
-        (0, browse_1.logBrowseCommands)();
-    }
-    else {
-        await (0, legacy_1.proxyHandlerOptionsToLegacyCli)(options);
-    }
-}
-exports.default = helpHandler;