wrangler 0.0.0-e95e5a0 → 0.0.0-e98613f8

package/src/__tests__/d1.test.ts

@@ -0,0 +1,80 @@
+import { mockAccountId } from "./helpers/mock-account-id";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runWrangler } from "./helpers/run-wrangler";
+
+function endEventLoop() {
+	return new Promise((resolve) => setImmediate(resolve));
+}
+
+describe("d1", () => {
+	const std = mockConsoleMethods();
+
+	mockAccountId();
+
+	it("should show help when no argument is passed", async () => {
+		await runWrangler("d1");
+		await endEventLoop();
+
+		expect(std.out).toMatchInlineSnapshot(`
+		"wrangler d1
+
+		🗄  Interact with a D1 database
+
+		Commands:
+		  wrangler d1 list                List D1 databases
+		  wrangler d1 create <name>       Create D1 database
+		  wrangler d1 delete <name>       Delete D1 database
+		  wrangler d1 backup              Interact with D1 Backups
+		  wrangler d1 execute <database>  Executed command or SQL file
+		  wrangler d1 migrations          Interact with D1 Migrations
+
+		Flags:
+		  -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]
+
+		🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
+		Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
+		To request features, visit https://community.cloudflare.com/c/developers/d1.
+		To give feedback, visit https://discord.gg/cloudflaredev"
+	`);
+	});
+
+	it("should show help when an invalid argument is passed", async () => {
+		await expect(() => runWrangler("d1 asdf")).rejects.toThrow(
+			"Unknown argument: asdf"
+		);
+
+		expect(std.err).toMatchInlineSnapshot(`
+		"X [ERROR] Unknown argument: asdf
+
+		"
+	`);
+		expect(std.out).toMatchInlineSnapshot(`
+		"
+		wrangler d1
+
+		🗄  Interact with a D1 database
+
+		Commands:
+		  wrangler d1 list                List D1 databases
+		  wrangler d1 create <name>       Create D1 database
+		  wrangler d1 delete <name>       Delete D1 database
+		  wrangler d1 backup              Interact with D1 Backups
+		  wrangler d1 execute <database>  Executed command or SQL file
+		  wrangler d1 migrations          Interact with D1 Migrations
+
+		Flags:
+		  -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]
+
+		🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
+		Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
+		To request features, visit https://community.cloudflare.com/c/developers/d1.
+		To give feedback, visit https://discord.gg/cloudflaredev"
+	`);
+	});
+});

package/src/__tests__/delete.test.ts

@@ -0,0 +1,263 @@
+import { rest } from "msw";
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConfirm } from "./helpers/mock-dialogs";
+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();
+
+	const std = mockConsoleMethods();
+
+	it("should delete an entire service by name", async () => {
+		mockConfirm({
+			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
+			result: true,
+		});
+		mockListKVNamespacesRequest();
+		mockDeleteWorkerRequest({ name: "my-script" });
+		await runWrangler("delete --name my-script");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "Successfully deleted my-script",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it("should delete a script by configuration", async () => {
+		mockConfirm({
+			text: `Are you sure you want to delete test-name? This action cannot be undone.`,
+			result: true,
+		});
+		writeWranglerToml();
+		mockListKVNamespacesRequest();
+		mockDeleteWorkerRequest();
+		await runWrangler("delete");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "Successfully deleted test-name",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it("shouldn't delete a service when doing a --dry-run", async () => {
+		await runWrangler("delete --name xyz --dry-run");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "--dry-run: exiting now.",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it('shouldn\'t delete when the user says "no"', async () => {
+		mockConfirm({
+			text: `Are you sure you want to delete xyz? This action cannot be undone.`,
+			result: false,
+		});
+
+		await runWrangler("delete --name xyz");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it("should delete a site namespace associated with a worker", async () => {
+		const kvNamespaces = [
+			{
+				title: "__my-script-workers_sites_assets",
+				id: "id-for-my-script-site-ns",
+			},
+			// this one isn't associated with the worker
+			{
+				title: "__test-name-workers_sites_assets",
+				id: "id-for-another-site-ns",
+			},
+		];
+
+		mockConfirm({
+			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
+			result: true,
+		});
+		mockListKVNamespacesRequest(...kvNamespaces);
+		// it should only try to delete the site namespace associated with this worker
+		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": "",
+		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
+		Successfully deleted my-script",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it("should delete a site namespace associated with a worker, including it's preview namespace", async () => {
+		// This is the same test as the previous one, but it includes a preview namespace
+		const kvNamespaces = [
+			{
+				title: "__my-script-workers_sites_assets",
+				id: "id-for-my-script-site-ns",
+			},
+			// this is the preview namespace
+			{
+				title: "__my-script-workers_sites_assets_preview",
+				id: "id-for-my-script-site-preview-ns",
+			},
+
+			// this one isn't associated with the worker
+			{
+				title: "__test-name-workers_sites_assets",
+				id: "id-for-another-site-ns",
+			},
+		];
+
+		mockConfirm({
+			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
+			result: true,
+		});
+		mockListKVNamespacesRequest(...kvNamespaces);
+		// it should only try to delete the site namespace associated with this worker
+
+		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: {},
+						})
+					);
+				}
+			)
+		);
+
+		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" });
+		await runWrangler("delete --name my-script");
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "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",
+		  "warn": "",
+		}
+	`);
+	});
+});
+
+/** Create a mock handler for the request to upload a worker script. */
+function mockDeleteWorkerRequest(
+	options: {
+		name?: string;
+		env?: string;
+		legacyEnv?: boolean;
+	} = {}
+) {
+	const { env, legacyEnv, name } = options;
+	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(req.url.searchParams.get("force")).toEqual("true");
+
+				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[]) {
+	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

@@ -0,0 +1,91 @@
+// 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 {
+	msw,
+	mswSuccessOauthHandlers,
+	mswSuccessUserHandlers,
+} from "./helpers/msw";
+import { mswSuccessDeployments } from "./helpers/msw";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("deployments", () => {
+	const std = mockConsoleMethods();
+	runInTempDir();
+	mockAccountId();
+	mockApiToken();
+	runInTempDir();
+
+	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",
+									},
+								},
+							},
+						})
+					);
+				}
+			)
+		);
+	});
+
+	it("should log deployments", async () => {
+		await runWrangler("deployments");
+		expect(std.out).toMatchInlineSnapshot(`
+		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+
+
+		Deployment ID: Galaxy-Class
+		Created on: 2021-01-01T00:00:00.000000Z
+		Author: Jean-Luc-Picard@federation.org
+		Source: Wrangler
+
+		Deployment ID: Intrepid-Class
+		Created on: 2021-02-02T00:00:00.000000Z
+		Author: Kathryn-Janeway@federation.org
+		Source: Wrangler
+		🟩 Active"
+	`);
+	});
+
+	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
+
+
+		Deployment ID: Galaxy-Class
+		Created on: 2021-01-01T00:00:00.000000Z
+		Author: Jean-Luc-Picard@federation.org
+		Source: Wrangler
+
+		Deployment ID: Intrepid-Class
+		Created on: 2021-02-02T00:00:00.000000Z
+		Author: Kathryn-Janeway@federation.org
+		Source: Wrangler
+		🟩 Active"
+	`);
+	});
+});