SQC-480 update -uuid to -id per api changes

Author: Adrian Gracia

packages/wrangler/src/__tests__/hyperdrive.test.ts

@@ -628,13 +628,13 @@ describe("hyperdrive commands", () => {
 	it("should create a hyperdrive with mtls config", async () => {
 		const reqProm = mockHyperdriveCreate();
 		await runWrangler(
-			"hyperdrive create test123 --host=example.com --database=neondb --user=test --password=password --port=1234 --ca-certificate-uuid=12345 --mtls-certificate-uuid=1234"
+			"hyperdrive create test123 --host=example.com --database=neondb --user=test --password=password --port=1234 --ca-certificate-id=12345 --mtls-certificate-id=1234"
 		);
 		await expect(reqProm).resolves.toMatchInlineSnapshot(`
 			Object {
 			  "mtls": Object {
-			    "ca_certificate_uuid": "12345",
-			    "mtls_certificate_uuid": "1234",
+			    "ca_certificate_id": "12345",
+			    "mtls_certificate_id": "1234",
 			  },
 			  "name": "test123",
 			  "origin": Object {
@@ -668,15 +668,15 @@ describe("hyperdrive commands", () => {
 		await runWrangler("hyperdrive list");
 		expect(std.out).toMatchInlineSnapshot(`
 			"📋 Listing Hyperdrive configs
-			┌──────────────────────────────────────┬─────────────┬─────────┬────────────────┬──────┬────────────┬───────────┬──────────┬───────────────────────────────────────────────────────────────┐
-			│ id                                   │ name        │ user    │ host           │ port │ scheme     │ database  │ caching  │ mtls                                                          │
-			├──────────────────────────────────────┼─────────────┼─────────┼────────────────┼──────┼────────────┼───────────┼──────────┼───────────────────────────────────────────────────────────────┤
-			│ xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx │ test123     │ test    │ example.com    │ 5432 │ PostgreSQL │ neondb    │ enabled  │                                                               │
-			├──────────────────────────────────────┼─────────────┼─────────┼────────────────┼──────┼────────────┼───────────┼──────────┼───────────────────────────────────────────────────────────────┤
-			│ yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy │ new-db      │ dbuser  │ www.google.com │ 3211 │ PostgreSQL │ mydb      │ disabled │                                                               │
-			├──────────────────────────────────────┼─────────────┼─────────┼────────────────┼──────┼────────────┼───────────┼──────────┼───────────────────────────────────────────────────────────────┤
-			│ zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz │ new-db-mtls │ pg-mtls │ www.mtls.com   │ 3212 │            │ mydb-mtls │ enabled  │ {\\"ca_certificate_uuid\\":\\"1234\\",\\"mtls_certificate_uuid\\":\\"1234\\"} │
-			└──────────────────────────────────────┴─────────────┴─────────┴────────────────┴──────┴────────────┴───────────┴──────────┴───────────────────────────────────────────────────────────────┘"
+			┌──────────────────────────────────────┬─────────────┬─────────┬────────────────┬──────┬────────────┬───────────┬──────────┬───────────────────────────────────────────────────────────┐
+			│ id                                   │ name        │ user    │ host           │ port │ scheme     │ database  │ caching  │ mtls                                                      │
+			├──────────────────────────────────────┼─────────────┼─────────┼────────────────┼──────┼────────────┼───────────┼──────────┼───────────────────────────────────────────────────────────┤
+			│ xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx │ test123     │ test    │ example.com    │ 5432 │ PostgreSQL │ neondb    │ enabled  │                                                           │
+			├──────────────────────────────────────┼─────────────┼─────────┼────────────────┼──────┼────────────┼───────────┼──────────┼───────────────────────────────────────────────────────────┤
+			│ yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy │ new-db      │ dbuser  │ www.google.com │ 3211 │ PostgreSQL │ mydb      │ disabled │                                                           │
+			├──────────────────────────────────────┼─────────────┼─────────┼────────────────┼──────┼────────────┼───────────┼──────────┼───────────────────────────────────────────────────────────┤
+			│ zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz │ new-db-mtls │ pg-mtls │ www.mtls.com   │ 3212 │            │ mydb-mtls │ enabled  │ {\\"ca_certificate_id\\":\\"1234\\",\\"mtls_certificate_id\\":\\"1234\\"} │
+			└──────────────────────────────────────┴─────────────┴─────────┴────────────────┴──────┴────────────┴───────────┴──────────┴───────────────────────────────────────────────────────────┘"
 		`);
 	});
 
@@ -985,13 +985,13 @@ describe("hyperdrive commands", () => {
 	it("should handle updating a hyperdrive config's mtls configuration", async () => {
 		const reqProm = mockHyperdriveUpdate();
 		await runWrangler(
-			"hyperdrive update xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --ca-certificate-uuid=2345 --mtls-certificate-uuid=234"
+			"hyperdrive update xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --ca-certificate-id=2345 --mtls-certificate-id=234"
 		);
 		await expect(reqProm).resolves.toMatchInlineSnapshot(`
 			Object {
 			  "mtls": Object {
-			    "ca_certificate_uuid": "2345",
-			    "mtls_certificate_uuid": "234",
+			    "ca_certificate_id": "2345",
+			    "mtls_certificate_id": "234",
 			  },
 			}
 		`);
@@ -1009,8 +1009,8 @@ describe("hyperdrive commands", () => {
 			    \\"user\\": \\"test\\"
 			  },
 			  \\"mtls\\": {
-			    \\"ca_certificate_uuid\\": \\"2345\\",
-			    \\"mtls_certificate_uuid\\": \\"234\\"
+			    \\"ca_certificate_id\\": \\"2345\\",
+			    \\"mtls_certificate_id\\": \\"234\\"
 			  }
 			}"
 		`);
@@ -1078,8 +1078,8 @@ function mockHyperdriveGetListOrDelete() {
 									scheme: "pg-mtls",
 								},
 								mtls: {
-									ca_certificate_uuid: "1234",
-									mtls_certificate_uuid: "1234",
+									ca_certificate_id: "1234",
+									mtls_certificate_id: "1234",
 								},
 							},
 						],
@@ -1131,8 +1131,8 @@ function mockHyperdriveUpdate(): Promise<PatchHyperdriveBody> {
 					}
 					const mtls = defaultConfig.mtls;
 					if (mtls && reqBody.mtls) {
-						mtls.ca_certificate_uuid = reqBody.mtls.ca_certificate_uuid;
-						mtls.mtls_certificate_uuid = reqBody.mtls.mtls_certificate_uuid;
+						mtls.ca_certificate_id = reqBody.mtls.ca_certificate_id;
+						mtls.mtls_certificate_id = reqBody.mtls.mtls_certificate_id;
 					}
 
 					return HttpResponse.json(

packages/wrangler/src/hyperdrive/client.ts

@@ -85,8 +85,8 @@ export type PatchHyperdriveBody = {
 };
 
 export type Mtls = {
-	ca_certificate_uuid?: string;
-	mtls_certificate_uuid?: string;
+	ca_certificate_id?: string;
+	mtls_certificate_id?: string;
 };
 
 export async function createConfig(

packages/wrangler/src/hyperdrive/index.ts

@@ -117,12 +117,12 @@ export function upsertOptions<T>(yargs: Argv<T>) {
 				describe:
 					"Indicates the number of seconds cache may serve the response after it becomes stale, cannot be set when caching is disabled",
 			},
-			"ca-certificate-uuid": {
+			"ca-certificate-id": {
 				type: "string",
 				describe:
 					"Sets custom CA certificate when connecting to origin database. Must be valid UUID of already uploaded CA certificate.",
 			},
-			"mtls-certificate-uuid": {
+			"mtls-certificate-id": {
 				type: "string",
 				describe:
 					"Sets custom mTLS client certificates when connecting to origin database. Must be valid UUID of already uploaded public/private key certificates.",
@@ -321,8 +321,8 @@ export function getMtlsFromArgs(
 	args: StrictYargsOptionsToInterface<typeof upsertOptions>
 ): Mtls | undefined {
 	const mtls = {
-		ca_certificate_uuid: args.caCertificateUuid,
-		mtls_certificate_uuid: args.mtlsCertificateUuid,
+		ca_certificate_id: args.caCertificateId,
+		mtls_certificate_id: args.mtlsCertificateId,
 	};
 
 	if (JSON.stringify(mtls) === "{}") {