debug

Author: jseba

packages/containers-shared/src/client/core/request.ts

@@ -9,21 +9,17 @@ import type { ApiRequestOptions } from "./ApiRequestOptions";
 import type { ApiResult } from "./ApiResult";
 import type { OnCancel } from "./CancelablePromise";
 
-interface FetchResponseInfo {
+type FetchResponseInfo = {
 	code: number;
-	documentation_url?: string;
 	message: string;
-	source?: {
-		pointer?: string;
-	};
-}
+};
 
-interface FetchResult<ResponseType = any> {
+type FetchResult<ResponseType = unknown> = {
 	success: boolean;
-	result: ResponseType;
-	errors: FetchResponseInfo[];
+	result?: ResponseType;
+	errors?: FetchResponseInfo[];
 	messages?: FetchResponseInfo[];
-}
+};
 
 const isDefined = <T>(
 	value: T | null | undefined
@@ -220,6 +216,36 @@ const isResponseSchemaV4 = (
 	return config.BASE.endsWith("/containers");
 };
 
+const parseResponseSchemaV4 = <T>(
+	url: string,
+	response: Response,
+	responseHeader: string | undefined,
+	responseBody: any
+): ApiResult => {
+	const fetchResult = responseBody as FetchResult<T>;
+	const ok = response.ok && fetchResult.success;
+	console.log(`${JSON.stringify(fetchResult)}`);
+	let result: T | undefined;
+	let error: FetchResponseInfo | undefined;
+	if (ok && fetchResult.result !== undefined) {
+		result = fetchResult.result;
+	} else {
+		if (fetchResult.errors !== undefined) {
+			error = fetchResult.errors[0];
+		} else {
+			console.log("no errors");
+		}
+	}
+
+	return {
+		url,
+		ok,
+		status: response.status,
+		statusText: response.statusText,
+		body: responseHeader ?? ok ? result : error,
+	};
+};
+
 export const sendRequest = async (
 	config: OpenAPIConfig,
 	options: ApiRequestOptions,
@@ -342,26 +368,24 @@ export const request = <T>(
 					options.responseHeader
 				);
 
-				const parseResponseSchemaV4 = (body: any): ApiResult => {
-					const fetchResult = body as FetchResult<T>;
-					return {
+				let result: ApiResult;
+
+				if (isResponseSchemaV4(config, options)) {
+					result = parseResponseSchemaV4(
+						url,
+						response,
+						responseHeader,
+						responseBody
+					);
+				} else {
+					result = {
 						url,
-						ok: response.ok && fetchResult.success,
+						ok: response.ok,
 						status: response.status,
 						statusText: response.statusText,
-						body: responseHeader ?? fetchResult.result,
+						body: responseHeader ?? responseBody,
 					};
-				};
-
-				const result: ApiResult = isResponseSchemaV4(config, options)
-					? parseResponseSchemaV4(responseBody)
-					: {
-							url,
-							ok: response.ok,
-							status: response.status,
-							statusText: response.statusText,
-							body: responseHeader ?? responseBody,
-						};
+				}
 
 				catchErrorCodes(options, result);
 				resolve(result.body);

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

@@ -7,6 +7,8 @@ import { useMockIsTTY } from "../helpers/mock-istty";
 import { msw } from "../helpers/msw";
 import { runWrangler } from "../helpers/run-wrangler";
 
+const testContainerID = "6925adea-c4ad-4aa6-bffd-d26783e9afbb";
+
 describe("containers delete", () => {
 	const stdCli = mockCLIOutput();
 
@@ -52,14 +54,17 @@ describe("containers delete", () => {
 				"*/applications/:id",
 				async ({ request }) => {
 					expect(await request.text()).toEqual("");
-					return new HttpResponse(`{"error": "something happened"}`, {
-						status: code,
-					});
+					return new HttpResponse(
+						`{"success": false, "errors": [{"code": 1000, "message": "something happened"}]}`,
+						{
+							status: code,
+						}
+					);
 				},
 				{ once: true }
 			)
 		);
-		await expect(runWrangler("containers delete 123")).rejects
+		await expect(runWrangler(`containers delete ${testContainerID}`)).rejects
 			.toMatchInlineSnapshot(`
 			[Error: There has been an error deleting the container.
 			something happened]
@@ -86,14 +91,14 @@ describe("containers delete", () => {
 				"*/applications/:id",
 				async ({ request }) => {
 					expect(await request.text()).toEqual("");
-					return new HttpResponse(`{"error": "something happened"}`, {
+					return new HttpResponse(`{"success": false, "errors": []}`, {
 						status: 500,
 					});
 				},
 				{ once: true }
 			)
 		);
-		await expect(runWrangler("containers delete 123")).rejects
+		await expect(runWrangler(`containers delete ${testContainerID}`)).rejects
 			.toMatchInlineSnapshot(`
 			[Error: There has been an unknown error deleting the container.
 			"{/"error/": /"something happened/"}"]
@@ -122,7 +127,7 @@ describe("containers delete", () => {
 				{ once: true }
 			)
 		);
-		await runWrangler("containers delete 123");
+		await runWrangler(`containers delete ${testContainerID}`);
 		expect(stdCli.stderr).toMatchInlineSnapshot(`""`);
 		expect(stdCli.stdout).toMatchInlineSnapshot(`
 			"├ Loading account
@@ -145,12 +150,12 @@ describe("containers delete", () => {
 				"*/applications/:id",
 				async ({ request }) => {
 					expect(await request.text()).toEqual("");
-					return new HttpResponse("{}");
+					return new HttpResponse("{success: true, result: {}}");
 				},
 				{ once: true }
 			)
 		);
-		await runWrangler("containers delete --json asdf");
+		await runWrangler(`containers delete --json ${testContainerID}`);
 		expect(std.err).toMatchInlineSnapshot(`""`);
 		expect(std.out).toMatchInlineSnapshot(`"\\"{}\\""`);
 	});
@@ -163,15 +168,21 @@ describe("containers delete", () => {
 				"*/applications/*",
 				async ({ request }) => {
 					expect(await request.text()).toEqual("");
-					return new HttpResponse(JSON.stringify({ error: "Not Found" }), {
-						status: 404,
-					});
+					return new HttpResponse(
+						JSON.stringify({
+							success: false,
+							errors: [{ code: 1000, message: "Not Found" }],
+						}),
+						{
+							status: 404,
+						}
+					);
 				},
 				{ once: true }
 			)
 		);
 		expect(std.err).toMatchInlineSnapshot(`""`);
-		await runWrangler("containers delete --json nope");
+		await runWrangler(`containers delete --json ${testContainerID}`);
 		expect(std.out).toMatchInlineSnapshot(
 			`"\\"{/\\"error/\\":/\\"Not Found/\\"}\\""`
 		);

packages/wrangler/src/cloudchamber/common.ts

@@ -40,6 +40,13 @@ export const cloudchamberScope = "cloudchamber:write" as const;
 
 export type CommonCloudchamberConfiguration = { json: boolean };
 
+const containerIdRe = /[^/]{36}/;
+
+export function isValidContainerID(value: string): boolean {
+	const matches = value.match(containerIdRe);
+	return matches !== null;
+}
+
 /**
  * Regular expression for matching an image name.
  *

packages/wrangler/src/cloudchamber/delete.ts

@@ -3,7 +3,11 @@ import { inputPrompt } from "@cloudflare/cli/interactive";
 import { DeploymentsService } from "@cloudflare/containers-shared";
 import { UserError } from "../errors";
 import { logDeployment, pickDeployment } from "./cli/deployments";
-import { interactWithUser, loadAccountSpinner } from "./common";
+import {
+	interactWithUser,
+	isValidContainerID,
+	loadAccountSpinner,
+} from "./common";
 import { wrap } from "./helpers/wrap";
 import type { Config } from "../config";
 import type {
@@ -31,6 +35,8 @@ export async function deleteCommand(
 			throw new Error(
 				"there needs to be a deploymentId when you can't interact with the wrangler cli"
 			);
+		} else if (!isValidContainerID(deleteArgs.deploymentId)) {
+			throw new UserError("deploymentId must be a UUID");
 		}
 
 		const deployment = await DeploymentsService.deleteDeploymentV2(

packages/wrangler/src/containers/containers.ts

@@ -9,7 +9,7 @@ import { processArgument } from "@cloudflare/cli/args";
 import { dim, gray } from "@cloudflare/cli/colors";
 import { inputPrompt, spinner } from "@cloudflare/cli/interactive";
 import { ApiError, ApplicationsService } from "@cloudflare/containers-shared";
-import { loadAccountSpinner } from "../cloudchamber/common";
+import { isValidContainerID, loadAccountSpinner } from "../cloudchamber/common";
 import { wrap } from "../cloudchamber/helpers/wrap";
 import { UserError } from "../errors";
 import isInteractive from "../is-interactive";
@@ -34,11 +34,12 @@ export async function deleteCommand(
 	deleteArgs: StrictYargsOptionsToInterfaceJSON<typeof deleteYargs>,
 	_config: Config
 ) {
-	await loadAccountSpinner(deleteArgs);
 	if (!deleteArgs.ID) {
 		throw new Error(
 			"You must provide an ID. Use 'wrangler containers list` to view your containers."
 		);
+	} else if (!isValidContainerID(deleteArgs.ID)) {
+		throw new UserError("ID must be a UUID");
 	}
 
 	if (deleteArgs.json) {