SSH: add support for ssh -N

src/commands/ssh.ts

@@ -33,7 +33,8 @@ import yargs from "yargs";
 export type SshCommandArgs = {
   destination: string;
   command?: string;
-  L?: string; // port forwarding option
+  L?: string; // Port forwarding option
+  N?: boolean; // No remote command
   arguments: string[];
   reason?: string;
 };
@@ -74,16 +75,21 @@ export const sshCommand = (yargs: yargs.Argv) =>
             INVALID_PORT_FORWARD_FORMAT_ERROR_MESSAGE
           );
         })
+        // Match `p0 request --reason`
+        .option("reason", {
+          describe: "Reason access is needed",
+          type: "string",
+        })
         .option("L", {
           type: "string",
           describe:
             // the order of the sockets in the address matches the ssh man page
             "Forward a local port to the remote host; `local_socket:remote_socket`",
         })
-        // Match `p0 request --reason`
-        .option("reason", {
-          describe: "Reason access is needed",
-          type: "string",
+        .option("N", {
+          type: "boolean",
+          describe:
+            "Do not execute a remote command. Useful for forwarding ports.",
         }),
     guard(ssh)
   );

src/plugins/aws/ssm/index.ts

@@ -51,6 +51,7 @@ type SsmArgs = {
   requestId: string;
   documentName: string;
   command?: string;
+  noRemoteCommands?: boolean;
   forwardPortAddress?: string;
 };
 
@@ -147,17 +148,22 @@ const createPortForwardingCommand = (args: Omit<SsmArgs, "requestId">) => {
 const createSsmCommands = (
   args: Omit<SsmArgs, "requestId">
 ): { command: string[]; subcommand?: string[] } => {
-  const command = createInteractiveShellCommand(args);
+  const interactiveShellCommand = createInteractiveShellCommand(args);
 
-  if (args.forwardPortAddress) {
+  if (!args.forwardPortAddress) {
     return {
-      command,
-      subcommand: createPortForwardingCommand(args),
+      command: interactiveShellCommand,
     };
   }
 
+  const portForwardingCommand = createPortForwardingCommand(args);
+  if (args.noRemoteCommands) {
+    return { command: portForwardingCommand };
+  }
+
   return {
-    command,
+    command: interactiveShellCommand,
+    subcommand: portForwardingCommand,
   };
 };
 
@@ -368,6 +374,7 @@ export const ssm = async (
     region: region!,
     documentName: request.generated.documentName,
     requestId: request.id,
+    noRemoteCommands: args.N,
     forwardPortAddress: args.L,
     command: commandParameter(args),
   };