wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/delete.test.ts

@@ -1,21 +1,21 @@
+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 } from "./helpers/mock-dialogs";
+import { useMockIsTTY } from "./helpers/mock-istty";
+import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import writeWranglerToml from "./helpers/write-wrangler-toml";
 import type { KVNamespaceInfo } from "../kv/helpers";
-
 describe("delete", () => {
 	mockAccountId();
 	mockApiToken();
 	runInTempDir();
-
-	afterEach(() => {
-		unsetAllMocks();
+	const { setIsTTY } = useMockIsTTY();
+	beforeEach(() => {
+		setIsTTY(true);
 	});
-
 	const std = mockConsoleMethods();
 
 	it("should delete an entire service by name", async () => {
@@ -31,6 +31,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "Successfully deleted my-script",
 		  "warn": "",
 		}
@@ -51,6 +52,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "Successfully deleted test-name",
 		  "warn": "",
 		}
@@ -64,6 +66,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "--dry-run: exiting now.",
 		  "warn": "",
 		}
@@ -82,6 +85,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "",
 		  "warn": "",
 		}
@@ -107,20 +111,26 @@ describe("delete", () => {
 		});
 		mockListKVNamespacesRequest(...kvNamespaces);
 		// it should only try to delete the site namespace associated with this worker
-		setMockResponse(
-			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
-			"DELETE",
-			([_url, accountId]) => {
-				expect(accountId).toEqual("some-account-id");
-				return null;
-			}
+		msw.use(
+			rest.delete(
+				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					return res.once(
+						ctx.status(200),
+						ctx.json({ success: true, errors: [], messages: [], result: null })
+					);
+				}
+			)
 		);
+
 		mockDeleteWorkerRequest({ name: "my-script" });
 		await runWrangler("delete --name my-script");
 		expect(std).toMatchInlineSnapshot(`
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
 		Successfully deleted my-script",
 		  "warn": "",
@@ -155,22 +165,40 @@ describe("delete", () => {
 		mockListKVNamespacesRequest(...kvNamespaces);
 		// it should only try to delete the site namespace associated with this worker
 
-		setMockResponse(
-			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
-			"DELETE",
-			([_url, accountId]) => {
-				expect(accountId).toEqual("some-account-id");
-				return null;
-			}
+		msw.use(
+			rest.delete(
+				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					return res.once(
+						ctx.status(200),
+						ctx.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: {},
+						})
+					);
+				}
+			)
 		);
 
-		setMockResponse(
-			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
-			"DELETE",
-			([_url, accountId]) => {
-				expect(accountId).toEqual("some-account-id");
-				return null;
-			}
+		msw.use(
+			rest.delete(
+				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					return res.once(
+						ctx.status(200),
+						ctx.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: {},
+						})
+					);
+				}
+			)
 		);
 
 		mockDeleteWorkerRequest({ name: "my-script" });
@@ -179,6 +207,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
 		🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets_preview\\"
 		Successfully deleted my-script",
@@ -197,34 +226,47 @@ function mockDeleteWorkerRequest(
 	} = {}
 ) {
 	const { env, legacyEnv, name } = options;
-	setMockResponse(
-		// there's no special handling for environments yet
-		"/accounts/:accountId/workers/services/:scriptName",
-		"DELETE",
-		async ([_url, accountId, scriptName], { method }, queryParams) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(method).toEqual("DELETE");
-			expect(scriptName).toEqual(
-				legacyEnv && env
-					? `${name || "test-name"}-${env}`
-					: `${name || "test-name"}`
-			);
+	msw.use(
+		rest.delete(
+			"*/accounts/:accountId/workers/services/:scriptName",
+			(req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.scriptName).toEqual(
+					legacyEnv && env
+						? `${name ?? "test-name"}-${env}`
+						: `${name ?? "test-name"}`
+				);
 
-			expect(queryParams.get("force")).toEqual("true");
+				expect(req.url.searchParams.get("force")).toEqual("true");
 
-			return null;
-		}
+				return res.once(
+					ctx.status(200),
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: null,
+					})
+				);
+			}
+		)
 	);
 }
 
 /** Create a mock handler for the request to get a list of all KV namespaces. */
 function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
-	setMockResponse(
-		"/accounts/:accountId/storage/kv/namespaces",
-		"GET",
-		([_url, accountId]) => {
-			expect(accountId).toEqual("some-account-id");
-			return namespaces;
-		}
+	msw.use(
+		rest.get("*/accounts/:accountId/storage/kv/namespaces", (req, res, ctx) => {
+			expect(req.params.accountId).toEqual("some-account-id");
+			return res.once(
+				ctx.status(200),
+				ctx.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: namespaces,
+				})
+			);
+		})
 	);
 }

package/src/__tests__/deployments.test.ts

@@ -1,16 +1,20 @@
-// import * as fs from "fs";
-// import * as TOML from "@iarna/toml";
 import { rest } from "msw";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
+import { clearDialogs, mockConfirm, mockPrompt } from "./helpers/mock-dialogs";
+import { useMockIsTTY } from "./helpers/mock-istty";
 import {
 	msw,
 	mswSuccessOauthHandlers,
 	mswSuccessUserHandlers,
+	mswSuccessDeploymentDetails,
+	mswSuccessDeploymentScriptMetadata,
+	createFetchResult,
 } from "./helpers/msw";
 import { mswSuccessDeployments } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
+import writeWranglerToml from "./helpers/write-wrangler-toml";
 
 describe("deployments", () => {
 	const std = mockConsoleMethods();
@@ -18,78 +22,348 @@ describe("deployments", () => {
 	mockAccountId();
 	mockApiToken();
 	runInTempDir();
+	afterAll(() => {
+		clearDialogs();
+	});
 
 	beforeEach(() => {
 		msw.use(
 			...mswSuccessDeployments,
 			...mswSuccessOauthHandlers,
 			...mswSuccessUserHandlers,
-			rest.get(
-				"*/accounts/:accountId/workers/services/:scriptName",
-				(request, response, context) => {
-					expect(["undefined", "somethingElse"]).toContain(
-						request.params.scriptName
-					);
-
-					return response.once(
-						context.status(200),
-						context.json({
-							success: true,
-							errors: [],
-							messages: [],
-							result: {
-								default_environment: {
-									script: {
-										tag: "MOCK-TAG",
-									},
-								},
-							},
-						})
-					);
-				}
-			)
+			...mswSuccessDeploymentScriptMetadata,
+			...mswSuccessDeploymentDetails
 		);
 	});
 
-	it("should log deployments", async () => {
-		await runWrangler("deployments");
+	it("should log a help message for deployments command", async () => {
+		await runWrangler("deployments --help");
 		expect(std.out).toMatchInlineSnapshot(`
-		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+		"wrangler deployments
+
+		🚢 List and view details for deployments
 
+		Commands:
+		  wrangler deployments list                  🚢 Displays the 10 most recent deployments for a worker
+		  wrangler deployments view [deployment-id]  🔍 View a deployment
 
-		Deployment ID: Intrepid-Class
-		Deployment number: NCC-74656
-		Created on: 2021-02-02T00:00:00.000000Z
-		Author: Kathryn-Janeway@federation.org
-		Source: Wrangler
+		Flags:
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]
 
-		Deployment ID: Galaxy-Class
-		Deployment number: 1701-E
-		Created on: 2021-01-01T00:00:00.000000Z
-		Author: Jean-Luc-Picard@federation.org
-		Source: Wrangler
-		🟩Active"
+		Options:
+		      --name  The name of your worker  [string]
+
+		🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose"
 	`);
 	});
 
-	it("should log deployments for script with passed in name option", async () => {
-		await runWrangler("deployments --name somethingElse");
-		expect(std.out).toMatchInlineSnapshot(`
-		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+	describe("deployments subcommands", () => {
+		describe("deployments list", () => {
+			it("should log deployments", async () => {
+				writeWranglerToml();
 
+				await runWrangler("deployments list");
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
 
-		Deployment ID: Intrepid-Class
-		Deployment number: NCC-74656
-		Created on: 2021-02-02T00:00:00.000000Z
-		Author: Kathryn-Janeway@federation.org
-		Source: Wrangler
 
-		Deployment ID: Galaxy-Class
-		Deployment number: 1701-E
-		Created on: 2021-01-01T00:00:00.000000Z
-		Author: Jean-Luc-Picard@federation.org
-		Source: Wrangler
-		🟩Active"
-	`);
+			Deployment ID: Constitution-Class
+			Created on:    2021-01-01T00:00:00.000000Z
+			Author:        Jean-Luc-Picard@federation.org
+			Source:        Upload from Wrangler 🤠
+
+			Deployment ID: Intrepid-Class
+			Created on:    2021-02-02T00:00:00.000000Z
+			Author:        Kathryn-Janeway@federation.org
+			Source:        Rollback from Wrangler 🤠
+			Rollback from: MOCK-DEPLOYMENT-ID-1111
+			Message:       Rolled back for this version
+
+			Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Created on:    2021-02-03T00:00:00.000000Z
+			Author:        Kathryn-Janeway@federation.org
+			Source:        Wrangler 🤠
+
+			Deployment ID: Galaxy-Class
+			Created on:    2021-01-04T00:00:00.000000Z
+			Author:        Jean-Luc-Picard@federation.org
+			Source:        Rollback from Wrangler 🤠
+			Rollback from: MOCK-DEPLOYMENT-ID-2222
+			🟩 Active"
+		`);
+			});
+
+			it("should log deployments for script with passed in name option", async () => {
+				await runWrangler("deployments list --name something-else");
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Deployment ID: Constitution-Class
+			Created on:    2021-01-01T00:00:00.000000Z
+			Author:        Jean-Luc-Picard@federation.org
+			Source:        Upload from Wrangler 🤠
+
+			Deployment ID: Intrepid-Class
+			Created on:    2021-02-02T00:00:00.000000Z
+			Author:        Kathryn-Janeway@federation.org
+			Source:        Rollback from Wrangler 🤠
+			Rollback from: MOCK-DEPLOYMENT-ID-1111
+			Message:       Rolled back for this version
+
+			Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Created on:    2021-02-03T00:00:00.000000Z
+			Author:        Kathryn-Janeway@federation.org
+			Source:        Wrangler 🤠
+
+			Deployment ID: Galaxy-Class
+			Created on:    2021-01-04T00:00:00.000000Z
+			Author:        Jean-Luc-Picard@federation.org
+			Source:        Rollback from Wrangler 🤠
+			Rollback from: MOCK-DEPLOYMENT-ID-2222
+			🟩 Active"
+		`);
+			});
+
+			it("should error on missing script name", async () => {
+				await expect(
+					runWrangler("deployments list")
+				).rejects.toMatchInlineSnapshot(
+					`[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name\`]`
+				);
+			});
+		});
+		describe("deployment view", () => {
+			it("should log deployment details", async () => {
+				writeWranglerToml();
+
+				await runWrangler("deployments view 1701-E");
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Deployment ID:       1701-E
+			Created on:          2021-01-01T00:00:00.000000Z
+			Author:              Jean-Luc-Picard@federation.org
+			Source:              Wrangler 🤠
+			------------------------------------------------------------
+			Author ID:           Picard-Gamma-6-0-7-3
+			Usage Model:         bundled
+			Handlers:            fetch
+			--------------------------bindings--------------------------
+			None
+			"
+		`);
+			});
+
+			it("should log deployment details with bindings", async () => {
+				writeWranglerToml();
+
+				await runWrangler("deployments view bindings-tag");
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Deployment ID:       1701-E
+			Created on:          2021-01-01T00:00:00.000000Z
+			Author:              Jean-Luc-Picard@federation.org
+			Source:              Wrangler 🤠
+			------------------------------------------------------------
+			Author ID:           Picard-Gamma-6-0-7-3
+			Usage Model:         bundled
+			Handlers:            fetch
+			--------------------------bindings--------------------------
+			[[r2_buckets]]
+			binding = \\"MY_BUCKET\\"
+			bucket_name = \\"testr2\\"
+
+			"
+		`);
+			});
+			it("should automatically log latest deployment details", async () => {
+				writeWranglerToml();
+
+				await runWrangler("deployments view");
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Deployment ID:       1701-E
+			Created on:          2021-01-01T00:00:00.000000Z
+			Author:              Jean-Luc-Picard@federation.org
+			Source:              Wrangler 🤠
+			------------------------------------------------------------
+			Author ID:           Picard-Gamma-6-0-7-3
+			Usage Model:         bundled
+			Handlers:            fetch
+			--------------------------bindings--------------------------
+			None
+			"
+		`);
+			});
+		});
+
+		describe("rollback", () => {
+			const { setIsTTY } = useMockIsTTY();
+			const requests = { count: 0 };
+			beforeEach(() => {
+				setIsTTY(true);
+				requests.count = 0;
+				msw.use(
+					rest.put(
+						"*/accounts/:accountID/workers/scripts/:scriptName",
+						(req, res, ctx) => {
+							expect(req.url.searchParams.get("rollback_to")).toBe(
+								"3mEgaU1T-Intrepid-someThing"
+							);
+
+							requests.count++;
+
+							return res.once(
+								ctx.json(
+									createFetchResult({
+										created_on: "2222-11-18T16:40:48.50545Z",
+										modified_on: "2222-01-20T18:08:47.464024Z",
+										id: "space_craft_1",
+										tag: "alien_tech_001",
+										tags: ["hyperdrive", "laser_cannons", "shields"],
+										deployment_id: "galactic_mission_alpha",
+										logpush: true,
+										etag: "13a3240e8fb414561b0366813b0b8f42b3e6cfa0d9e70e99835dae83d0d8a794",
+										handlers: [
+											"interstellar_communication",
+											"hyperspace_navigation",
+										],
+										last_deployed_from: "spaceport_alpha",
+										usage_model: "intergalactic",
+										script: `addEventListener('interstellar_communication', event =\u003e
+							{ event.respondWith(transmit(event.request)) }
+							)`,
+										size: "1 light-year",
+									})
+								)
+							);
+						}
+					)
+				);
+			});
+
+			it("should successfully rollback and output a success message", async () => {
+				mockConfirm({
+					text: "This deployment 3mEgaU1T will immediately replace the current deployment and become the active deployment across all your deployed routes and domains. However, your local development environment will not be affected by this rollback. Note: Rolling back to a previous deployment will not rollback any of the bound resources (Durable Object, R2, KV, etc.).",
+					result: true,
+				});
+
+				mockPrompt({
+					text: "Please provide a message for this rollback (120 characters max)",
+					result: "",
+				});
+
+				await runWrangler("rollback 3mEgaU1T-Intrepid-someThing");
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Successfully rolled back to Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Current Deployment ID: galactic_mission_alpha"
+		`);
+
+				expect(requests.count).toEqual(1);
+			});
+
+			it("should early exit from rollback if user denies continuing", async () => {
+				mockConfirm({
+					text: "This deployment 3mEgaU1T will immediately replace the current deployment and become the active deployment across all your deployed routes and domains. However, your local development environment will not be affected by this rollback. Note: Rolling back to a previous deployment will not rollback any of the bound resources (Durable Object, R2, KV, etc.).",
+					result: false,
+				});
+
+				await runWrangler("rollback 3mEgaU1T-Intrpid-someThing");
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+			"
+		`);
+
+				expect(requests.count).toEqual(0);
+			});
+
+			it("should skip prompt automatically in rollback if in a non-TTY environment", async () => {
+				setIsTTY(false);
+
+				await runWrangler("rollback 3mEgaU1T-Intrepid-someThing");
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+			? This deployment 3mEgaU1T will immediately replace the current deployment and become the active deployment across all your deployed routes and domains. However, your local development environment will not be affected by this rollback. Note: Rolling back to a previous deployment will not rollback any of the bound resources (Durable Object, R2, KV, etc.).
+			🤖 Using default value in non-interactive context: yes
+			? Please provide a message for this rollback (120 characters max)
+			🤖 Using default value in non-interactive context:
+
+			Successfully rolled back to Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Current Deployment ID: galactic_mission_alpha"
+		`);
+
+				expect(requests.count).toEqual(1);
+			});
+
+			it("should skip prompt automatically in rollback if message flag is provided", async () => {
+				await runWrangler(
+					`rollback 3mEgaU1T-Intrepid-someThing --message "test"`
+				);
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Successfully rolled back to Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Current Deployment ID: galactic_mission_alpha"
+		`);
+
+				expect(requests.count).toEqual(1);
+			});
+
+			it("should skip prompt automatically in rollback with empty message", async () => {
+				await runWrangler(
+					`rollback 3mEgaU1T-Intrepid-someThing --message "test"`
+				);
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Successfully rolled back to Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Current Deployment ID: galactic_mission_alpha"
+		`);
+
+				expect(requests.count).toEqual(1);
+			});
+
+			it("should automatically rollback to previous deployment when id is not specified", async () => {
+				mockConfirm({
+					text: "This deployment 3mEgaU1T will immediately replace the current deployment and become the active deployment across all your deployed routes and domains. However, your local development environment will not be affected by this rollback. Note: Rolling back to a previous deployment will not rollback any of the bound resources (Durable Object, R2, KV, etc.).",
+					result: true,
+				});
+
+				mockPrompt({
+					text: "Please provide a message for this rollback (120 characters max)",
+					result: "",
+				});
+
+				await runWrangler("rollback");
+				expect(std.out).toMatchInlineSnapshot(`
+			"🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+
+			Successfully rolled back to Deployment ID: 3mEgaU1T-Intrepid-someThing
+			Current Deployment ID: galactic_mission_alpha"
+		`);
+
+				expect(requests.count).toEqual(1);
+			});
+		});
 	});
 });