wrangler 2.1.14 → 2.2.0

package/src/__tests__/helpers/msw/handlers/deployments.ts

@@ -1,26 +1,6 @@
 import { rest } from "msw";
 
-export type DeploymentListRes = {
-	versions: {
-		version_id: string;
-		version_number: string;
-		metadata: {
-			author_id: string;
-			author_email: string;
-			source: "api" | "dash" | "wrangler" | "terraform" | "other";
-			created_on: string;
-			modified_on: string;
-		};
-		preview: {
-			active: boolean;
-			url: string;
-		};
-		resources: {
-			script: string;
-			bindings: unknown[];
-		};
-	}[];
-};
+import type { DeploymentListRes } from "../../../../deployments";
 
 export const mswSuccessDeployments = [
 	rest.get(
@@ -33,10 +13,25 @@ export const mswSuccessDeployments = [
 					errors: [],
 					messages: [],
 					result: {
-						versions: [
+						latest: {
+							id: "Galaxy-Class",
+							number: "1701-E",
+							metadata: {
+								author_id: "Picard-Gamma-6-0-7-3",
+								author_email: "Jean-Luc-Picard@federation.org",
+								source: "wrangler",
+								created_on: "2021-01-01T00:00:00.000000Z",
+								modified_on: "2021-01-01T00:00:00.000000Z",
+							},
+							resources: {
+								script: "MOCK-TAG",
+								bindings: [],
+							},
+						},
+						items: [
 							{
-								version_id: "Galaxy-Class",
-								version_number: "1701-E",
+								id: "Galaxy-Class",
+								number: "1701-E",
 								metadata: {
 									author_id: "Picard-Gamma-6-0-7-3",
 									author_email: "Jean-Luc-Picard@federation.org",
@@ -44,18 +39,10 @@ export const mswSuccessDeployments = [
 									created_on: "2021-01-01T00:00:00.000000Z",
 									modified_on: "2021-01-01T00:00:00.000000Z",
 								},
-								preview: {
-									active: true,
-									url: "https://example.com",
-								},
-								resources: {
-									script: "script.js",
-									bindings: [],
-								},
 							},
 							{
-								version_id: "Intrepid-Class",
-								version_number: "NCC-74656",
+								id: "Intrepid-Class",
+								number: "NCC-74656",
 								metadata: {
 									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
 									author_email: "Kathryn-Janeway@federation.org",
@@ -63,17 +50,9 @@ export const mswSuccessDeployments = [
 									created_on: "2021-02-02T00:00:00.000000Z",
 									modified_on: "2021-02-02T00:00:00.000000Z",
 								},
-								preview: {
-									active: true,
-									url: "https://example.com",
-								},
-								resources: {
-									script: "script.js",
-									bindings: [],
-								},
 							},
 						],
-					},
+					} as DeploymentListRes,
 				})
 			)
 	),

package/src/__tests__/helpers/msw/handlers/zones.ts

@@ -0,0 +1,22 @@
+import { rest } from "msw";
+
+export default [
+	rest.get("*/zones", ({ url: { searchParams } }, res, context) => {
+		return res(
+			context.status(200),
+			context.json({
+				success: true,
+				errors: [],
+				messages: [],
+				result:
+					searchParams.get("name") === "exists.com"
+						? [
+								{
+									id: "exists-com",
+								},
+						  ]
+						: [],
+			})
+		);
+	}),
+];

package/src/__tests__/helpers/msw/index.ts

@@ -1,10 +1,12 @@
 import { setupServer } from "msw/node";
+import { default as mswAccessHandlers } from "./handlers/access";
 import { mswSuccessDeployments } from "./handlers/deployments";
 import { mswSuccessNamespacesHandlers } from "./handlers/namespaces";
 import { mswSuccessOauthHandlers } from "./handlers/oauth";
 import { mswSuccessR2handlers } from "./handlers/r2";
 import { default as mswSucessScriptHandlers } from "./handlers/script";
 import { mswSuccessUserHandlers } from "./handlers/user";
+import { default as mswZoneHandlers } from "./handlers/zones";
 export const msw = setupServer();
 
 export {
@@ -13,5 +15,7 @@ export {
 	mswSuccessOauthHandlers,
 	mswSuccessNamespacesHandlers,
 	mswSucessScriptHandlers,
+	mswZoneHandlers,
 	mswSuccessDeployments,
+	mswAccessHandlers,
 };

package/src/__tests__/index.test.ts

@@ -42,6 +42,7 @@ describe("wrangler", () => {
 			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
 			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
 			  wrangler pages               ⚡️ Configure Cloudflare Pages
+			  wrangler queues              🆀 Configure Workers Queues
 			  wrangler r2                  📦 Interact with an R2 store
 			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
 			  wrangler d1                  🗄  Interact with a D1 database
@@ -53,6 +54,7 @@ describe("wrangler", () => {
 
 			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]"
 		`);
@@ -85,6 +87,7 @@ describe("wrangler", () => {
 			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
 			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
 			  wrangler pages               ⚡️ Configure Cloudflare Pages
+			  wrangler queues              🆀 Configure Workers Queues
 			  wrangler r2                  📦 Interact with an R2 store
 			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
 			  wrangler d1                  🗄  Interact with a D1 database
@@ -96,6 +99,7 @@ describe("wrangler", () => {
 
 			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]"
 		`);
@@ -142,6 +146,7 @@ describe("wrangler", () => {
 
 			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]"
 		`);
@@ -151,60 +156,63 @@ describe("wrangler", () => {
 			await runWrangler("kv:namespace");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-			        "wrangler kv:namespace
+			"wrangler kv:namespace
 
-			        🗂️  Interact with your Workers KV Namespaces
+			🗂️  Interact with your Workers KV Namespaces
 
-			        Commands:
-			          wrangler kv:namespace create <namespace>  Create a new namespace
-			          wrangler kv:namespace list                Outputs a list of all KV namespaces associated with your account id.
-			          wrangler kv:namespace delete              Deletes a given namespace.
+			Commands:
+			  wrangler kv:namespace create <namespace>  Create a new namespace
+			  wrangler kv:namespace list                Outputs a list of all KV namespaces associated with your account id.
+			  wrangler kv:namespace delete              Deletes a given namespace.
 
-			        Flags:
-			          -c, --config   Path to .toml configuration file  [string]
-			          -h, --help     Show help  [boolean]
-			          -v, --version  Show version number  [boolean]"
-		      `);
+			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]"
+		`);
 		});
 
 		it("no subcommand 'kv:key' should display a list of available subcommands", async () => {
 			await runWrangler("kv:key");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-			        "wrangler kv:key
+			"wrangler kv:key
 
-			        🔑 Individually manage Workers KV key-value pairs
+			🔑 Individually manage Workers KV key-value pairs
 
-			        Commands:
-			          wrangler kv:key put <key> [value]  Writes a single key/value pair to the given namespace.
-			          wrangler kv:key list               Outputs a list of all keys in a given namespace.
-			          wrangler kv:key get <key>          Reads a single value by key from the given namespace.
-			          wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
+			Commands:
+			  wrangler kv:key put <key> [value]  Writes a single key/value pair to the given namespace.
+			  wrangler kv:key list               Outputs a list of all keys in a given namespace.
+			  wrangler kv:key get <key>          Reads a single value by key from the given namespace.
+			  wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
 
-			        Flags:
-			          -c, --config   Path to .toml configuration file  [string]
-			          -h, --help     Show help  [boolean]
-			          -v, --version  Show version number  [boolean]"
-		      `);
+			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]"
+		`);
 		});
 
 		it("no subcommand 'kv:bulk' should display a list of available subcommands", async () => {
 			await runWrangler("kv:bulk");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-			        "wrangler kv:bulk
+			"wrangler kv:bulk
 
-			        💪 Interact with multiple Workers KV key-value pairs at once
+			💪 Interact with multiple Workers KV key-value pairs at once
 
-			        Commands:
-			          wrangler kv:bulk put <filename>     Upload multiple key-value pairs to a namespace
-			          wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
+			Commands:
+			  wrangler kv:bulk put <filename>     Upload multiple key-value pairs to a namespace
+			  wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
 
-			        Flags:
-			          -c, --config   Path to .toml configuration file  [string]
-			          -h, --help     Show help  [boolean]
-			          -v, --version  Show version number  [boolean]"
-		      `);
+			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]"
+		`);
 		});
 
 		it("no subcommand 'r2' should display a list of available subcommands", async () => {
@@ -221,6 +229,7 @@ describe("wrangler", () => {
 
 			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]"
 		`);

package/src/__tests__/init.test.ts

@@ -2087,8 +2087,8 @@ describe("init", () => {
 			},
 			{
 				type: "plain_text",
-				name: "ANOTHER",
-				text: "thing",
+				name: "ANOTHER-NAME",
+				text: "thing-TEXT",
 			},
 			{
 				type: "durable_object_namespace",
@@ -2218,8 +2218,7 @@ describe("init", () => {
 			},
 			usage_model: "bundled",
 			vars: {
-				name: "ANOTHER",
-				text: "thing",
+				"ANOTHER-NAME": "thing-TEXT",
 			},
 			env: {
 				test: {},
@@ -2380,6 +2379,8 @@ describe("init", () => {
 				"init isolinear-optical-chip --from-dash memory-crystal"
 			);
 
+			expect(std.out).toContain("cd isolinear-optical-chip");
+
 			checkFiles({
 				items: {
 					"isolinear-optical-chip/src/index.js": false,
@@ -2433,6 +2434,89 @@ describe("init", () => {
 
 			await runWrangler("init  --from-dash isolinear-optical-chip");
 
+			expect(fs.readFileSync("./isolinear-optical-chip/wrangler.toml", "utf8"))
+				.toMatchInlineSnapshot(`
+			"name = \\"isolinear-optical-chip\\"
+			main = \\"src/index.ts\\"
+			compatibility_date = \\"1987-9-27\\"
+			route = \\"delta.quadrant\\"
+			usage_model = \\"bundled\\"
+
+			[[migrations]]
+			tag = \\"some-migration-tag\\"
+			new_classes = [ \\"Durability\\" ]
+
+			[triggers]
+			crons = [ \\"0 0 0 * * *\\" ]
+
+			[env]
+			test = { }
+			staging = { }
+
+			[vars]
+			ANOTHER-NAME = \\"thing-TEXT\\"
+
+			[[durable_objects.bindings]]
+			name = \\"DURABLE_TEST\\"
+			class_name = \\"Durability\\"
+			script_name = \\"another-durable-object-worker\\"
+			environment = \\"production\\"
+
+			[[kv_namespaces]]
+			id = \\"some-namespace-id\\"
+			binding = \\"kv_testing\\"
+
+			[[r2_buckets]]
+			binding = \\"test-bucket\\"
+			bucket_name = \\"test-bucket\\"
+
+			[[services]]
+			binding = \\"website\\"
+			service = \\"website\\"
+			environment = \\"production\\"
+
+			[[dispatch_namespaces]]
+			binding = \\"name-namespace-mock\\"
+			namespace = \\"namespace-mock\\"
+
+			[logfwdr]
+			schema = \\"\\"
+
+			  [[logfwdr.bindings]]
+			  name = \\"httplogs\\"
+			  destination = \\"httplogs\\"
+
+			  [[logfwdr.bindings]]
+			  name = \\"trace\\"
+			  destination = \\"trace\\"
+
+			[wasm_modules]
+			WASM_MODULE_ONE = \\"./some_wasm.wasm\\"
+			WASM_MODULE_TWO = \\"./more_wasm.wasm\\"
+
+			[text_blobs]
+			TEXT_BLOB_ONE = \\"./my-entire-app-depends-on-this.cfg\\"
+			TEXT_BLOB_TWO = \\"./the-entirety-of-human-knowledge.txt\\"
+
+			[data_blobs]
+			DATA_BLOB_ONE = \\"DATA_BLOB_ONE\\"
+			DATA_BLOB_TWO = \\"DATA_BLOB_TWO\\"
+
+			[[unsafe.bindings]]
+			type = \\"some unsafe thing\\"
+			name = \\"UNSAFE_BINDING_ONE\\"
+
+			[unsafe.bindings.data.some]
+			unsafe = \\"thing\\"
+
+			[[unsafe.bindings]]
+			type = \\"another unsafe thing\\"
+			name = \\"UNSAFE_BINDING_TWO\\"
+			data = 1_337
+			"
+		`);
+			expect(std.out).toContain("cd isolinear-optical-chip");
+
 			checkFiles({
 				items: {
 					"isolinear-optical-chip/src/index.js": false,

package/src/__tests__/jest.setup.ts

@@ -39,6 +39,17 @@ jest.mock("get-port", () => {
 	};
 });
 
+jest.mock("child_process", () => {
+	return {
+		__esModule: true,
+		...jest.requireActual("child_process"),
+		spawnSync: jest.fn().mockImplementation(async (binary, ...args) => {
+			if (binary === "cloudflared") return { error: true };
+			return jest.requireActual("child_process").spawnSync(binary, ...args);
+		}),
+	};
+});
+
 jest.mock("ws", () => {
 	return {
 		__esModule: true,