@govuk-pay/cli 0.0.18 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",
@@ -14,6 +14,7 @@
     "@aws-sdk/client-ec2": "^3.641.0",
     "@aws-sdk/client-ecs": "^3.637.0",
     "@aws-sdk/client-rds": "^3.637.0",
+    "@aws-sdk/client-ssm": "^3.651.1",
     "openurl": "^1.1.1",
     "ts-standard": "^12.0.2"
   },

package/src/commands/tunnel.js

@@ -8,11 +8,13 @@ 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");
 const client_rds_1 = require("@aws-sdk/client-rds");
+const client_ssm_1 = require("@aws-sdk/client-ssm");
 const readline_1 = __importDefault(require("readline"));
 const child_process_1 = require("child_process");
 const constants_js_1 = require("../core/constants.js");
 let ec2;
 let ecs;
+let ssm;
 const FORMAT = {
     red: '\x1b[31m',
     green: '\x1b[32m',
@@ -33,16 +35,16 @@ async function tunnelHandler(options) {
     console.log(`Opening a database tunnel to ${environment} ${application}`);
     ec2 = new client_ec2_1.EC2Client();
     ecs = new client_ecs_1.ECSClient();
+    ssm = new client_ssm_1.SSMClient();
     let bastionTask = null;
-    let tunnel = null;
     try {
         printWarningToUser();
         const database = await getDatabaseDetails(environment, application);
         bastionTask = await startBastion(environment);
-        tunnel = openTunnel(bastionTask, database, environment);
+        openTunnel(bastionTask, database, environment);
         printHowToTunnelText(application, environment, database.EngineVersion);
         await waitForExit();
-        await shutdown(environment, tunnel, bastionTask);
+        await shutdown(environment, bastionTask);
     }
     catch (error) {
         if (typeof error === 'string') {
@@ -51,7 +53,7 @@ async function tunnelHandler(options) {
         else if (error instanceof Error) {
             printError(error.message);
         }
-        await shutdown(environment, tunnel, bastionTask);
+        await shutdown(environment, bastionTask);
         process.exit(2);
     }
 }
@@ -287,7 +289,7 @@ function openTunnel(task, db, environment) {
         console.error(`tunnel command error: ${data}`);
     });
     tunnelProc.on('close', (code, _signal) => {
-        if (code !== null) {
+        if (code !== null && code !== 0) {
             console.error(`\nTunnel unexpectedly closed with exit code: ${code}`);
             console.group();
             console.error('Type `exit` or `Ctrl-C` to shutdown the bastion task then try again.');
@@ -305,15 +307,10 @@ function openTunnel(task, db, environment) {
     });
     return tunnelProc;
 }
-async function shutdown(environment, tunnel, bastionTask) {
+async function shutdown(environment, bastionTask) {
     console.log('Shutting down');
-    if (tunnel !== undefined && tunnel !== null) {
-        if (tunnel.exitCode === null && tunnel.pid !== undefined) {
-            process.kill(-(tunnel.pid));
-        }
-        else {
-            console.log(`Tunnel already closed, exit code: ${tunnel?.exitCode ?? 'no exit code'}`);
-        }
+    if (bastionTask != null) {
+        await terminateSession(bastionTask, environment);
     }
     if (bastionTask !== null) {
         bastionTask = await refreshTask(bastionTask.taskArn, environment);
@@ -323,6 +320,31 @@ async function shutdown(environment, tunnel, bastionTask) {
     }
     printGreen('Shutdown complete.');
 }
+async function terminateSession(task, environment) {
+    const cluster = `${environment}-fargate`;
+    const ecsTaskId = task.taskArn?.split('/').at(-1);
+    const ecsContainerRunTimeId = task.containers?.map(c => c.runtimeId)[0];
+    const target = `ecs:${cluster}_${ecsTaskId}_${ecsContainerRunTimeId}`;
+    const describeSessionsCommand = new client_ssm_1.DescribeSessionsCommand({
+        State: 'Active',
+        Filters: [
+            {
+                key: 'Target',
+                value: target
+            }
+        ]
+    });
+    const describeSessionsOutput = await ssm.send(describeSessionsCommand);
+    const sessions = describeSessionsOutput.Sessions;
+    if (sessions != null) {
+        for (const session of sessions) {
+            const terminateSessionCommand = new client_ssm_1.TerminateSessionCommand({
+                SessionId: session.SessionId
+            });
+            await ssm.send(terminateSessionCommand);
+        }
+    }
+}
 function printHowToTunnelText(application, environment, dbEngineVersion) {
     const dbUser = getDbUser(application);
     const payLowPassDbSecretName = getPayLowPassDbSecretname(environment, dbUser);