@govuk-pay/cli 0.0.35 → 0.0.37

package/package.json

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

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

@@ -4,7 +4,7 @@ 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");
 const standardContent_1 = require("../../../core/standardContent");
-exports.command = 'opt <key>';
+exports.command = 'otp <key>';
 exports.desc = 'Create otp code';
 const builder = (yargs) => {
     return yargs.positional('key', {

package/src/commands/tunnel.js

@@ -22,7 +22,8 @@ const FORMAT = {
     yellow: '\x1b[33m',
     reset: '\x1b[0m',
     ul: '\x1b[4m',
-    ulstop: '\x1b[24m'
+    ulstop: '\x1b[24m',
+    bel: '\u0007'
 };
 exports.command = 'tunnel <environment> <application>';
 exports.desc = 'Open a tunnel to an app database in a given environment';
@@ -66,6 +67,15 @@ async function tunnelHandler(argv) {
     const environment = argv.environment;
     const application = argv.application;
     console.log(`Opening a database tunnel to ${environment} ${application}`);
+    let maximumDuration = 90;
+    if (process.env.MAXIMUM_DURATION !== undefined) {
+        maximumDuration = parseInt(process.env.MAXIMUM_DURATION);
+        if (isNaN(maximumDuration)) {
+            maximumDuration = 90;
+            console.log(`${FORMAT.yellow}MAXIMUM_DURATION should be a whole number of minutes, e.g. MAXIMUM_DURATION=60. Defaulting to ${maximumDuration}.${FORMAT.reset}`);
+        }
+    }
+    const warnTime = maximumDuration * 0.75;
     ec2 = new client_ec2_1.EC2Client();
     ecs = new client_ecs_1.ECSClient();
     ssm = new client_ssm_1.SSMClient();
@@ -74,10 +84,19 @@ async function tunnelHandler(argv) {
         printWarningToUser();
         const dbAccessType = await readInputForReadOrWriteDBAccess();
         const database = await getDatabaseDetails(environment, application);
-        bastionTask = await startBastion(environment);
+        bastionTask = await startBastion(environment, maximumDuration);
+        console.log(`${FORMAT.bel}${FORMAT.yellow}The bastion service will terminate in ${maximumDuration} minutes.${FORMAT.reset}`);
+        const warnTimeout = setTimeout(() => {
+            console.log(`${FORMAT.bel}${FORMAT.yellow}The bastion service will terminate in ${maximumDuration - warnTime} minutes.${FORMAT.reset}`);
+        }, warnTime * 60 * 1000);
+        const exitTimeout = setTimeout(() => {
+            console.log(`${FORMAT.bel}${FORMAT.yellow}The bastion service will now terminate, your tunnel may stop unexpectedly.${FORMAT.reset}`);
+        }, maximumDuration * 60 * 1000);
         openTunnel(bastionTask, database, environment);
         await printHowToTunnelText(application, environment, database.EngineVersion, dbAccessType);
         await waitForExit();
+        clearTimeout(warnTimeout);
+        clearTimeout(exitTimeout);
         await shutdown(environment, bastionTask);
     }
     catch (error) {
@@ -117,10 +136,10 @@ async function waitForExit() {
         });
     });
 }
-async function startBastion(environment) {
+async function startBastion(environment, maximumDuration) {
     const subnetIds = await getBastionSubNets(environment);
     const securityGroupIds = await getBastionSecurityGroups(environment);
-    let bastionTask = await launchBastionTask(environment, subnetIds, securityGroupIds);
+    let bastionTask = await launchBastionTask(environment, subnetIds, securityGroupIds, maximumDuration);
     bastionTask = await waitForBastionToBeReady(bastionTask, environment);
     return bastionTask;
 }
@@ -156,12 +175,29 @@ async function getBastionSecurityGroups(environment) {
         .filter(s => s.GroupId !== undefined)
         .map((securityGroup) => securityGroup.GroupId);
 }
-async function launchBastionTask(environment, subnetIds, securityGroupIds) {
+async function launchBastionTask(environment, subnetIds, securityGroupIds, maximumDuration) {
+    let taskDefinition = `${environment}-bastion`;
+    if (process.env.BASTION_TASK_DEF_NAME != null && process.env.BASTION_TASK_DEF_NAME.length > 0) {
+        taskDefinition = process.env.BASTION_TASK_DEF_NAME;
+    }
     const runTaskCommand = new client_ecs_1.RunTaskCommand({
         cluster: `${environment}-fargate`,
-        taskDefinition: `${environment}-bastion`,
+        taskDefinition,
         launchType: 'FARGATE',
         enableExecuteCommand: true,
+        overrides: {
+            containerOverrides: [
+                {
+                    name: `${environment}-bastion`,
+                    environment: [
+                        {
+                            name: 'MAXIMUM_DURATION',
+                            value: `${maximumDuration}m`
+                        }
+                    ]
+                }
+            ]
+        },
         networkConfiguration: {
             awsvpcConfiguration: {
                 subnets: subnetIds,
@@ -430,5 +466,5 @@ function printError(error) {
     console.error(`${FORMAT.red}${error}${FORMAT.reset}`);
 }
 function printGreen(message) {
-    console.error(`${FORMAT.green}${message}${FORMAT.reset}`);
+    console.log(`${FORMAT.green}${message}${FORMAT.reset}`);
 }