fix ci (hopefully)

Signed-off-by: flakey5 <[email protected]>

Author: flakey5

packages/containers-shared/src/ssh.ts

@@ -43,6 +43,10 @@ export function createSshTcpProxy(sshResponse: WranglerSSHResponse): Server {
 
 		hasConnection = true;
 
+		inbound.on("error", (err) => {
+			console.error("Proxy error: ", err);
+		});
+
 		const ws = new WebSocket(sshResponse.url, {
 			headers: {
 				authorization: `Bearer ${sshResponse.token}`,
@@ -61,10 +65,6 @@ export function createSshTcpProxy(sshResponse: WranglerSSHResponse): Server {
 				ws.send(data);
 			});
 
-			inbound.on("error", (err) => {
-				console.error("Proxy error: ", err);
-			});
-
 			inbound.on("close", () => {
 				ws.close();
 				proxy.close();

packages/wrangler/src/__tests__/containers/ssh.test.ts

@@ -39,17 +39,15 @@ describe("containers ssh", () => {
 			  -v, --version   Show version number  [boolean]
 
 			OPTIONS
-			      --cipher         SSH option for cipher_spec (-c)  [string]
-			      --log-file       SSH option for log_file (-c)  [string]
-			      --escape-char    SSH option for escape_char (-e)  [string]
-			      --config-file    SSH option for config-file (-F)  [string]
-			      --pkcs11         SSH option for pkcs11 (-I)  [string]
-			      --identity-file  SSH option for identity_file (-i)  [string]
-			      --mac-spec       SSH option for mac_spec (-m)  [string]
-			      --ctl-cmd        SSH option for ctl_cmd (-O)  [string]
-			      --option         SSH option for option (-o)  [string]
-			      --tag            SSH option for tag (-P)  [string]
-			      --ctl-path       SSH option for ctl_path (-S)  [string]"
+			      --cipher         SSH option: Selects the cipher specification for encrypting the session  [string]
+			      --log-file       SSH option: Append debug logs to log_file instead of standard error  [string]
+			      --escape-char    SSH option: Sets the escape character for sessions with a pty (default: ‘~’)  [string]
+			      --config-file    SSH option: Specifies an alternative per-user configuration file  [string]
+			      --pkcs11         SSH option: Specify the PKCS#11 shared library ssh should use to communicate with a PKCS#11 token providing keys for user authentication  [string]
+			      --identity-file  SSH option: Selects a file from which the identity (private key) for public key authentication is read  [string]
+			      --mac-spec       SSH option: A comma-separated list of MAC (message authentication code) algorithms, specified in order of preference  [string]
+			      --option         SSH option: Can be used to give options in the format used in the configuration file  [string]
+			      --tag            SSH option: Specify a tag name that may be used to select configuration in ssh_config(5)  [string]"
 		`);
 	});
 
@@ -89,38 +87,30 @@ describe("containers ssh", () => {
 	// actual ssh attempt will fail since we don't have an ssh instance to test
 	// against, but everything up until that point is covered.
 	it("should try ssh'ing into a container", async () => {
-		try {
-			const instanceId = "a".repeat(64);
-			const wsUrl = "ws://localhost:1234";
-			const sshJwt = "asd";
-
-			setWranglerConfig({});
-			msw.use(
-				http.get(`*/instances/:instanceId/ssh`, async () => {
-					return new HttpResponse(
-						`{"success": true, "result": {"url": "${wsUrl}", "token": "${sshJwt}"}}`,
-						{
-							type: "applicaton/json",
-							status: 200,
-						}
-					);
-				})
-			);
-
-			const mockWebSocket = new MockWebSocketServer(wsUrl);
-
-			await expect(runWrangler(`containers ssh ${instanceId}`)).rejects
-				.toMatchInlineSnapshot(`
+		const instanceId = "a".repeat(64);
+		const wsUrl = "ws://localhost:1234";
+		const sshJwt = "asd";
+
+		setWranglerConfig({});
+		msw.use(
+			http.get(`*/instances/:instanceId/ssh`, async () => {
+				return new HttpResponse(
+					`{"success": true, "result": {"url": "${wsUrl}", "token": "${sshJwt}"}}`,
+					{
+						type: "applicaton/json",
+						status: 200,
+					}
+				);
+			})
+		);
+
+		const mockWebSocket = new MockWebSocketServer(wsUrl);
+		await expect(runWrangler(`containers ssh ${instanceId}`)).rejects
+			.toMatchInlineSnapshot(`
 			[Error: ssh exited unsuccessfully. Is the container running?]
 		`);
 
-			// We got a connection
-			expect(mockWebSocket.connected).toBeTruthy();
-		} catch (err) {
-			if (err instanceof Error) {
-				console.error(err.stack);
-			}
-			throw err;
-		}
+		// We got a connection
+		expect(mockWebSocket.connected).toBeTruthy();
 	});
 });

packages/wrangler/src/config/validation.ts

@@ -2749,13 +2749,6 @@ function validateContainerApp(
 			}
 
 			if ("wrangler_ssh" in containerAppOptional) {
-				validateAdditionalProperties(
-					diagnostics,
-					`${field}.wrangler_ssh`,
-					Object.keys(containerAppOptional.wrangler_ssh),
-					["enabled", "port"]
-				);
-
 				if (
 					!isRequiredProperty(
 						containerAppOptional.wrangler_ssh,
@@ -2800,13 +2793,6 @@ function validateContainerApp(
 						const fieldPath = `${field}.authorized_keys[${index}]`;
 						const key = containerAppOptional.authorized_keys[index];
 
-						validateAdditionalProperties(
-							diagnostics,
-							fieldPath,
-							Object.keys(key),
-							["name", "public_key"]
-						);
-
 						if (!isRequiredProperty(key, "name", "string")) {
 							diagnostics.errors.push(`${fieldPath}.name must be a string`);
 						}

packages/wrangler/src/containers/containers.ts

@@ -167,47 +167,48 @@ export function sshYargs(args: CommonYargsArgv) {
 			})
 			// Following are SSH flags that should be directly passed in
 			.option("cipher", {
-				describe: "SSH option for cipher_spec (-c)",
+				describe:
+					"SSH option: Selects the cipher specification for encrypting the session",
 				type: "string",
 			})
 			.option("log-file", {
-				describe: "SSH option for log_file (-c)",
+				describe:
+					"SSH option: Append debug logs to log_file instead of standard error",
 				type: "string",
 			})
 			.option("escape-char", {
-				describe: "SSH option for escape_char (-e)",
+				describe:
+					"SSH option: Sets the escape character for sessions with a pty (default: ‘~’)",
 				type: "string",
 			})
 			.option("config-file", {
-				describe: "SSH option for config-file (-F)",
+				describe:
+					"SSH option: Specifies an alternative per-user configuration file",
 				type: "string",
 			})
 			.option("pkcs11", {
-				describe: "SSH option for pkcs11 (-I)",
+				describe:
+					"SSH option: Specify the PKCS#11 shared library ssh should use to communicate with a PKCS#11 token providing keys for user authentication",
 				type: "string",
 			})
 			.option("identity-file", {
-				describe: "SSH option for identity_file (-i)",
+				describe:
+					"SSH option: Selects a file from which the identity (private key) for public key authentication is read",
 				type: "string",
 			})
 			.option("mac-spec", {
-				describe: "SSH option for mac_spec (-m)",
-				type: "string",
-			})
-			.option("ctl-cmd", {
-				describe: "SSH option for ctl_cmd (-O)",
+				describe:
+					"SSH option: A comma-separated list of MAC (message authentication code) algorithms, specified in order of preference",
 				type: "string",
 			})
 			.option("option", {
-				describe: "SSH option for option (-o)",
+				describe:
+					"SSH option: Can be used to give options in the format used in the configuration file",
 				type: "string",
 			})
 			.option("tag", {
-				describe: "SSH option for tag (-P)",
-				type: "string",
-			})
-			.option("ctl-path", {
-				describe: "SSH option for ctl_path (-S)",
+				describe:
+					"SSH option: Specify a tag name that may be used to select configuration in ssh_config(5)",
 				type: "string",
 			})
 	);