wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

package/src/__tests__/secret.test.ts

@@ -1,7 +1,8 @@
 import * as fs from "node:fs";
+import { writeFileSync } from "node:fs";
 import * as TOML from "@iarna/toml";
+import { rest } from "msw";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import {
 	mockConfirm,
@@ -9,14 +10,38 @@ import {
 	clearConfirmMocks,
 	clearPromptMocks,
 } from "./helpers/mock-dialogs";
-import {
-	mockGetMemberships,
-	mockGetMembershipsFail,
-} from "./helpers/mock-oauth-flow";
 import { useMockStdin } from "./helpers/mock-stdin";
+import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
+function createFetchResult(result: unknown, success = true) {
+	return {
+		success,
+		errors: [],
+		messages: [],
+		result,
+	};
+}
+
+export function mockGetMembershipsFail() {
+	msw.use(
+		rest.get("*/memberships", (req, res, ctx) => {
+			return res.once(ctx.json(createFetchResult([], false)));
+		})
+	);
+}
+
+export function mockGetMemberships(
+	accounts: { id: string; account: { id: string; name: string } }[]
+) {
+	msw.use(
+		rest.get("*/memberships", (req, res, ctx) => {
+			return res.once(ctx.json(createFetchResult(accounts)));
+		})
+	);
+}
+
 describe("wrangler secret", () => {
 	const std = mockConsoleMethods();
 
@@ -25,7 +50,6 @@ describe("wrangler secret", () => {
 	mockApiToken();
 
 	afterEach(() => {
-		unsetAllMocks();
 		clearConfirmMocks();
 		clearPromptMocks();
 	});
@@ -38,24 +62,25 @@ describe("wrangler secret", () => {
 		) {
 			const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 			const environment = env && !legacyEnv ? "/environments/:envName" : "";
-			setMockResponse(
-				`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
-				"PUT",
-				([_url, accountId, scriptName, envName], { body }) => {
-					expect(accountId).toEqual("some-account-id");
-					expect(scriptName).toEqual(
-						legacyEnv && env ? `script-name-${env}` : "script-name"
-					);
-					if (!legacyEnv) {
-						expect(envName).toEqual(env);
-					}
-					const { name, text, type } = JSON.parse(body as string);
-					expect(type).toEqual("secret_text");
-					expect(name).toEqual(input.name);
-					expect(text).toEqual(input.text);
+			msw.use(
+				rest.put(
+					`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
+					async (req, res, ctx) => {
+						expect(req.params.accountId).toEqual("some-account-id");
+						expect(req.params.scriptName).toEqual(
+							legacyEnv && env ? `script-name-${env}` : "script-name"
+						);
+						if (!legacyEnv) {
+							expect(req.params.envName).toEqual(env);
+						}
+						const { name, text, type } = await req.json();
+						expect(type).toEqual("secret_text");
+						expect(name).toEqual(input.name);
+						expect(text).toEqual(input.text);
 
-					return { name, type };
-				}
+						return res.once(ctx.json(createFetchResult({ name, type })));
+					}
+				)
 			);
 		}
 
@@ -95,6 +120,182 @@ describe("wrangler secret", () => {
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
+			it("should create secret:bulk", async () => {
+				writeFileSync(
+					"secret.json",
+					JSON.stringify({
+						"secret-name-1": "secret_text",
+						"secret-name-2": "secret_text",
+					})
+				);
+
+				// User counter to pass different secrets to the request mock
+				let counter = 0;
+				msw.use(
+					rest.put(
+						`*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
+						(req, res, ctx) => {
+							expect(req.params.accountId).toEqual("some-account-id");
+							counter++;
+
+							return res(
+								ctx.json(
+									createFetchResult({
+										name: `secret-name-${counter}`,
+										type: "secret_text",
+									})
+								)
+							);
+						}
+					)
+				);
+
+				await runWrangler("secret:bulk ./secret.json --name script-name");
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"🌀 Creating the secrets for the Worker \\"script-name\\"
+			✨ Successfully created secret for key: secret-name-1
+			✨ Successfully created secret for key: secret-name-2
+
+			Finished processing secrets JSON file:
+			✨ 2 secrets successfully uploaded"
+		`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should handle network failure on secret:bulk", async () => {
+				writeFileSync(
+					"secret.json",
+					JSON.stringify({
+						"secret-name-1": "secret_text",
+						"secret-name-2": "secret_text",
+					})
+				);
+
+				// User counter to pass different secrets to the request mock
+				let counter = 0;
+				msw.use(
+					rest.put(
+						`*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
+						(req, res) => {
+							expect(req.params.accountId).toEqual("some-account-id");
+							counter++;
+
+							return res.networkError(`Failed to create secret ${counter}`);
+						}
+					)
+				);
+
+				await runWrangler("secret:bulk ./secret.json --name script-name");
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"🌀 Creating the secrets for the Worker \\"script-name\\"
+
+			Finished processing secrets JSON file:
+			✨ 0 secrets successfully uploaded
+			🚨 2 secrets failed to upload"
+		`);
+				expect(std.err).toMatchInlineSnapshot(`
+			"X [ERROR] 🚨 Error uploading secret for key: secret-name-1:
+
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 1
+
+
+			X [ERROR] 🚨 Error uploading secret for key: secret-name-2:
+
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 2
+
+			"
+		`);
+			});
+
+			it("should count success and network failure on secret:bulk", async () => {
+				writeFileSync(
+					"secret.json",
+					JSON.stringify({
+						"secret-name-1": "secret_text",
+						"secret-name-2": "secret_text",
+						"secret-name-3": "secret_text",
+						"secret-name-4": "secret_text",
+						"secret-name-5": "secret_text",
+						"secret-name-6": "secret_text",
+						"secret-name-7": "secret_text",
+					})
+				);
+
+				// User counter to pass different secrets to the request mock
+				let counter = 0;
+				msw.use(
+					rest.put(
+						`*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
+						(req, res, ctx) => {
+							expect(req.params.accountId).toEqual("some-account-id");
+							counter++;
+
+							if (counter % 2 === 0) {
+								return res(
+									ctx.json(
+										createFetchResult({
+											name: `secret-name-${counter}`,
+											type: "secret_text",
+										})
+									)
+								);
+							} else {
+								return res.networkError(`Failed to create secret ${counter}`);
+							}
+						}
+					)
+				);
+
+				await runWrangler("secret:bulk ./secret.json --name script-name");
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"🌀 Creating the secrets for the Worker \\"script-name\\"
+			✨ Successfully created secret for key: secret-name-2
+			✨ Successfully created secret for key: secret-name-4
+			✨ Successfully created secret for key: secret-name-6
+
+			Finished processing secrets JSON file:
+			✨ 3 secrets successfully uploaded
+			🚨 4 secrets failed to upload"
+		`);
+				expect(std.err).toMatchInlineSnapshot(`
+			"X [ERROR] 🚨 Error uploading secret for key: secret-name-1:
+
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 1
+
+
+			X [ERROR] 🚨 Error uploading secret for key: secret-name-3:
+
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 3
+
+
+			X [ERROR] 🚨 Error uploading secret for key: secret-name-5:
+
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 5
+
+
+			X [ERROR] 🚨 Error uploading secret for key: secret-name-7:
+
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 7
+
+			"
+		`);
+			});
+
 			it("should create a secret: legacy envs", async () => {
 				mockPrompt({
 					text: "Enter a secret value:",
@@ -294,26 +495,22 @@ describe("wrangler secret", () => {
 		) {
 			const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 			const environment = env && !legacyEnv ? "/environments/:envName" : "";
-			setMockResponse(
-				`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
-				"DELETE",
-				([_url, accountId, scriptName, envOrSecretName, secretName]) => {
-					expect(accountId).toEqual("some-account-id");
-					expect(scriptName).toEqual(
-						legacyEnv && env ? `script-name-${env}` : "script-name"
-					);
-					if (!legacyEnv) {
-						if (env) {
-							expect(envOrSecretName).toEqual(env);
-							expect(secretName).toEqual(input.secretName);
-						} else {
-							expect(envOrSecretName).toEqual(input.secretName);
+			msw.use(
+				rest.delete(
+					`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
+					(req, res, ctx) => {
+						expect(req.params.accountId).toEqual("some-account-id");
+						expect(req.params.scriptName).toEqual(
+							legacyEnv && env ? `script-name-${env}` : "script-name"
+						);
+						if (!legacyEnv) {
+							if (env) {
+								expect(req.params.secretName).toEqual(input.secretName);
+							}
 						}
-					} else {
-						expect(envOrSecretName).toEqual(input.secretName);
+						return res.once(ctx.json(createFetchResult(null)));
 					}
-					return null;
-				}
+				)
 			);
 		}
 		it("should delete a secret", async () => {
@@ -400,25 +597,30 @@ describe("wrangler secret", () => {
 		) {
 			const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 			const environment = env && !legacyEnv ? "/environments/:envName" : "";
-			setMockResponse(
-				`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
-				"GET",
-				([_url, accountId, scriptName, envName]) => {
-					expect(accountId).toEqual("some-account-id");
-					expect(scriptName).toEqual(
-						legacyEnv && env ? `script-name-${env}` : "script-name"
-					);
-					if (!legacyEnv) {
-						expect(envName).toEqual(env);
-					}
+			msw.use(
+				rest.get(
+					`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
+					(req, res, ctx) => {
+						expect(req.params.accountId).toEqual("some-account-id");
+						expect(req.params.scriptName).toEqual(
+							legacyEnv && env ? `script-name-${env}` : "script-name"
+						);
+						if (!legacyEnv) {
+							expect(req.params.envName).toEqual(env);
+						}
 
-					return [
-						{
-							name: "the-secret-name",
-							type: "secret_text",
-						},
-					];
-				}
+						return res.once(
+							ctx.json(
+								createFetchResult([
+									{
+										name: "the-secret-name",
+										type: "secret_text",
+									},
+								])
+							)
+						);
+					}
+				)
 			);
 		}