Rename cloudchamber curl -D option to -d to match real curl

-D is supported as a hidden/deprecated alias

Author: gpanders

packages/wrangler/src/__tests__/cloudchamber/curl.test.ts

@@ -47,15 +47,91 @@ describe("cloudchamber curl", () => {
 
 			OPTIONS
 			  -H, --header              Add headers in the form of --header <name>:<value>  [array]
-			  -D, --data                Add a JSON body to the request  [string]
+			  -d, --data                Add a JSON body to the request  [string]
 			  -X, --method  [string] [default: \\"GET\\"]
 			  -s, --silent              Only output response  [boolean]
 			  -v, --verbose             Show version number  [boolean]
 			      --use-stdin, --stdin  Equivalent of using --data-binary @- in curl  [boolean]"
 		`);
 	});
 
-	it("should be able to use data flag", async () => {
+	it("can send data with -d/--data", async () => {
+		setIsTTY(false);
+		setWranglerConfig({});
+		msw.use(
+			http.post("*/deployments/v2", async ({ request }) => {
+				// verify we are hitting the expected url
+				expect(request.url).toEqual(baseRequestUrl + "deployments/v2");
+				// and that the request has the expected content
+				expect(await request.json()).toEqual({
+					image: "hello:world",
+					location: "sfo06",
+					ssh_public_key_ids: [],
+					environment_variables: [
+						{
+							name: "HELLO",
+							value: "WORLD",
+						},
+						{
+							name: "YOU",
+							value: "CONQUERED",
+						},
+					],
+					vcpu: 3,
+					memory_mib: 400,
+					network: {
+						assign_ipv4: "predefined",
+					},
+				});
+				return HttpResponse.json(MOCK_DEPLOYMENTS_COMPLEX[0]);
+			})
+		);
+
+		// We need to stringify this for cross-platform compatibility
+		const deployment = JSON.stringify({
+			image: "hello:world",
+			location: "sfo06",
+			ssh_public_key_ids: [],
+			environment_variables: [
+				{ name: "HELLO", value: "WORLD" },
+				{ name: "YOU", value: "CONQUERED" },
+			],
+			vcpu: 3,
+			memory_mib: 400,
+			network: { assign_ipv4: "predefined" },
+		});
+
+		await runWrangler(
+			"cloudchamber curl /deployments/v2 -X POST -d '" + deployment + "'"
+		);
+		expect(std.err).toMatchInlineSnapshot(`""`);
+		expect(std.out).toMatchInlineSnapshot(`
+			"{
+			    \\"id\\": \\"1\\",
+			    \\"type\\": \\"default\\",
+			    \\"created_at\\": \\"123\\",
+			    \\"account_id\\": \\"123\\",
+			    \\"vcpu\\": 4,
+			    \\"memory\\": \\"400MB\\",
+			    \\"memory_mib\\": 400,
+			    \\"version\\": 1,
+			    \\"image\\": \\"hello\\",
+			    \\"location\\": {
+			        \\"name\\": \\"sfo06\\",
+			        \\"enabled\\": true
+			    },
+			    \\"network\\": {
+			        \\"mode\\": \\"public\\",
+			        \\"ipv4\\": \\"1.1.1.1\\"
+			    },
+			    \\"placements_ref\\": \\"http://ref\\",
+			    \\"node_group\\": \\"metal\\"
+			}
+			"
+		`);
+	});
+
+	it("supports deprecated -D flag", async () => {
 		setIsTTY(false);
 		setWranglerConfig({});
 		msw.use(

packages/wrangler/src/cloudchamber/curl.ts

@@ -22,6 +22,11 @@ export function yargsCurl(args: yargs.Argv<CommonYargsOptions>) {
 		.option("data", {
 			type: "string",
 			describe: "Add a JSON body to the request",
+			alias: "d",
+		})
+		.option("data-deprecated", {
+			type: "string",
+			hidden: true,
 			alias: "D",
 		})
 		.option("method", {
@@ -67,6 +72,7 @@ async function requestFromCmd(
 		method: string;
 		header: (string | number)[] | undefined;
 		data?: string;
+		dataDeprecated?: string;
 		silent?: boolean;
 		verbose?: boolean;
 		useStdin?: boolean;
@@ -92,6 +98,8 @@ async function requestFromCmd(
 			}),
 			{ "coordinator-request-id": requestId }
 		);
+
+		const data = args.data ?? args.dataDeprecated;
 		const res = await request(OpenAPI, {
 			url: args.path,
 			method: args.method as
@@ -102,7 +110,7 @@ async function requestFromCmd(
 				| "OPTIONS"
 				| "HEAD"
 				| "PATCH",
-			body: args.data ? JSON.parse(args.data) : undefined,
+			body: data ? JSON.parse(data) : undefined,
 			mediaType: "application/json",
 			headers: headers,
 		});