wrangler 2.0.22 → 2.0.25

package/src/__tests__/index.test.ts

@@ -203,36 +203,19 @@ describe("wrangler", () => {
 			await runWrangler("r2");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-			        "wrangler r2
+			"wrangler r2
 
-			        📦 Interact with an R2 store
+			📦 Interact with an R2 store
 
-			        Commands:
-			          wrangler r2 bucket  Manage R2 buckets
-
-			        Flags:
-			          -c, --config   Path to .toml configuration file  [string]
-			          -h, --help     Show help  [boolean]
-			          -v, --version  Show version number  [boolean]"
-		      `);
-		});
-	});
+			Commands:
+			  wrangler r2 object  Manage R2 objects
+			  wrangler r2 bucket  Manage R2 buckets
 
-	describe("Deprecated commands", () => {
-		it("should print a deprecation message for 'generate'", async () => {
-			await runWrangler("generate").catch((err) => {
-				expect(err.message).toMatchInlineSnapshot(`
-			          "Deprecation:
-			          \`wrangler generate\` has been deprecated.
-			          Try running \`wrangler init\` to generate a basic Worker, or cloning the template repository instead:
-
-			          \`\`\`
-			          git clone https://github.com/cloudflare/worker-template
-			          \`\`\`
-
-			          Please refer to https://developers.cloudflare.com/workers/wrangler/deprecations/#generate for more information."
-		        `);
-			});
+			Flags:
+			  -c, --config   Path to .toml configuration file  [string]
+			  -h, --help     Show help  [boolean]
+			  -v, --version  Show version number  [boolean]"
+		`);
 		});
 	});
 

package/src/__tests__/jest.setup.ts

@@ -2,10 +2,15 @@ import fetchMock from "jest-fetch-mock";
 import {
 	fetchInternal,
 	fetchKVGetValue,
+	fetchR2Objects,
 	getCloudflareAPIBaseURL,
 } from "../cfetch/internal";
 import { confirm, prompt } from "../dialogs";
-import { mockFetchInternal, mockFetchKVGetValue } from "./helpers/mock-cfetch";
+import {
+	mockFetchInternal,
+	mockFetchKVGetValue,
+	mockFetchR2Objects,
+} from "./helpers/mock-cfetch";
 import { MockWebSocket } from "./helpers/mock-web-socket";
 
 // Mock out getPort since we don't actually care about what ports are open in unit tests.
@@ -43,6 +48,7 @@ jest.mock("../cfetch/internal");
 (getCloudflareAPIBaseURL as jest.Mock).mockReturnValue(
 	"https://api.cloudflare.com/client/v4"
 );
+(fetchR2Objects as jest.Mock).mockImplementation(mockFetchR2Objects);
 
 jest.mock("../dialogs");
 
@@ -118,3 +124,27 @@ jest.mock("xdg-app-paths", () => {
 		}),
 	};
 });
+
+jest.mock("create-cloudflare");
+
+jest.mock("../metrics/metrics-config", () => {
+	const realModule = jest.requireActual("../metrics/metrics-config");
+	const fakeModule = {
+		...realModule,
+		// Although we mock out the getMetricsConfig() function in most tests,
+		// we need a way to reinstate it for the metrics specific tests.
+		// This is what `useOriginal` is for.
+		useOriginal: false,
+		getMetricsConfig: (...args: unknown[]) =>
+			fakeModule.useOriginal
+				? realModule.getMetricsConfig(...args)
+				: async () => {
+						return {
+							enabled: false,
+							deviceId: "mock-device",
+							userId: undefined,
+						};
+				  },
+	};
+	return fakeModule;
+});

package/src/__tests__/kv.test.ts

@@ -4,8 +4,10 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
 	setMockResponse,
 	unsetAllMocks,
-	unsetMockFetchKVGetValues,
+	unsetSpecialMockFns,
 	setMockFetchKVGetValue,
+	setMockRawResponse,
+	createFetchResult,
 } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { clearConfirmMocks, mockConfirm } from "./helpers/mock-dialogs";
@@ -280,9 +282,9 @@ describe("wrangler", () => {
 				writeWranglerConfig();
 				await expect(runWrangler("kv:namespace delete --binding otherBinding"))
 					.rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Not able to delete namespace.
-                A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
-              `);
+						                "Not able to delete namespace.
+						                A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
+					              `);
 				expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] Not able to delete namespace.
 
@@ -299,7 +301,10 @@ describe("wrangler", () => {
 					"kv:namespace delete --binding someBinding --env some-environment --preview false"
 				);
 
-				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.out).toMatchInlineSnapshot(`
+					"Deleting KV namespace env-bound-id.
+					Deleted KV namespace env-bound-id."
+				`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(requests.count).toEqual(1);
 			});
@@ -919,7 +924,7 @@ describe("wrangler", () => {
 
 		describe("get", () => {
 			afterEach(() => {
-				unsetMockFetchKVGetValues();
+				unsetSpecialMockFns();
 			});
 
 			it("should get a key in a given namespace specified by namespace-id", async () => {
@@ -1181,12 +1186,12 @@ describe("wrangler", () => {
 					setIsTTY({ stdin: false, stdout: true });
 					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"one\\" - \\"1\\")
-                    \\"two\\" - \\"2\\")"
-                `);
+							                  "More than one account available but unable to select one in non-interactive mode.
+							                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+							                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+							                    \\"one\\" - \\"1\\")
+							                    \\"two\\" - \\"2\\")"
+						                `);
 				});
 
 				it("should error if there are multiple accounts available but not interactive on stdout", async () => {
@@ -1197,12 +1202,28 @@ describe("wrangler", () => {
 					setIsTTY({ stdin: true, stdout: false });
 					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"one\\" - \\"1\\")
-                    \\"two\\" - \\"2\\")"
-                `);
+							                  "More than one account available but unable to select one in non-interactive mode.
+							                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+							                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+							                    \\"one\\" - \\"1\\")
+							                    \\"two\\" - \\"2\\")"
+						                `);
+				});
+
+				it("should recommend using a configuration if unable to fetch memberships", async () => {
+					setMockRawResponse("/memberships", () => {
+						return createFetchResult(undefined, false, [
+							{
+								code: 9109,
+								message: "Uauthorized to access requested resource",
+							},
+						]);
+					});
+					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
+						.rejects.toThrowErrorMatchingInlineSnapshot(`
+							"Failed to automatically retrieve account IDs for the logged in user.
+							You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your \`wrangler.toml\`, or by setting the value of CLOUDFLARE_ACCOUNT_ID\\""
+						`);
 				});
 
 				it("should error if there are multiple accounts available but not interactive at all", async () => {
@@ -1213,12 +1234,12 @@ describe("wrangler", () => {
 					setIsTTY(false);
 					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"one\\" - \\"1\\")
-                    \\"two\\" - \\"2\\")"
-                `);
+							                  "More than one account available but unable to select one in non-interactive mode.
+							                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+							                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+							                    \\"one\\" - \\"1\\")
+							                    \\"two\\" - \\"2\\")"
+						                `);
 				});
 			});
 		});
@@ -1390,9 +1411,9 @@ describe("wrangler", () => {
 				await expect(
 					runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Expected an array of key-value objects but got type \\"object\\"."
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Expected an array of key-value objects but got type \\"object\\"."
+					              `);
 				expect(std.out).toMatchInlineSnapshot(`
           "
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
@@ -1430,30 +1451,30 @@ describe("wrangler", () => {
 				await expect(
 					runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Each item in the array should be an object that matches:
-
-                interface KeyValue {
-                  key: string;
-                  value: string;
-                  expiration?: number;
-                  expiration_ttl?: number;
-                  metadata?: object;
-                  base64?: boolean;
-                }
-
-                The item at index 0 is 123
-                The item at index 1 is \\"a string\\"
-                The item at index 2 is {\\"key\\":\\"someKey\\"}
-                The item at index 3 is {\\"value\\":\\"someValue\\"}
-                The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
-                The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
-                The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
-                The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
-                The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
-                The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
-                The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Each item in the array should be an object that matches:
+
+						                interface KeyValue {
+						                  key: string;
+						                  value: string;
+						                  expiration?: number;
+						                  expiration_ttl?: number;
+						                  metadata?: object;
+						                  base64?: boolean;
+						                }
+
+						                The item at index 0 is 123
+						                The item at index 1 is \\"a string\\"
+						                The item at index 2 is {\\"key\\":\\"someKey\\"}
+						                The item at index 3 is {\\"value\\":\\"someValue\\"}
+						                The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
+						                The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
+						                The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
+						                The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
+						                The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
+						                The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
+						                The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
+					              `);
 
 				expect(std.out).toMatchInlineSnapshot(`
           "
@@ -1592,10 +1613,10 @@ describe("wrangler", () => {
 						`kv:bulk delete --namespace-id some-namespace-id keys.json`
 					)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Expected an array of strings but got:
-                12354"
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Expected an array of strings but got:
+						                12354"
+					              `);
 				expect(std.out).toMatchInlineSnapshot(`
           "
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
@@ -1615,12 +1636,12 @@ describe("wrangler", () => {
 						`kv:bulk delete --namespace-id some-namespace-id keys.json`
 					)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Expected an array of strings.
-                The item at index 1 is type: \\"number\\" - 12354
-                The item at index 2 is type: \\"object\\" - {\\"key\\":\\"someKey\\"}
-                The item at index 3 is type: \\"object\\" - null"
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Expected an array of strings.
+						                The item at index 1 is type: \\"number\\" - 12354
+						                The item at index 2 is type: \\"object\\" - {\\"key\\":\\"someKey\\"}
+						                The item at index 3 is type: \\"object\\" - null"
+					              `);
 				expect(std.out).toMatchInlineSnapshot(`
           "
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"

package/src/__tests__/metrics.test.ts

@@ -26,6 +26,9 @@ describe("metrics", () => {
 	runInTempDir();
 
 	beforeEach(() => {
+		// Tell jest to use the original version of the `getMetricsConfig()` function in these tests.
+		const mockMetricsConfig = jest.requireMock("../metrics/metrics-config");
+		mockMetricsConfig.useOriginal = true;
 		global.SPARROW_SOURCE_KEY = "MOCK_KEY";
 		logger.loggerLevel = "debug";
 		// Create a node_modules directory to store config-cache files
@@ -65,6 +68,7 @@ describe("metrics", () => {
 						properties: {
 							category: "Workers",
 							wranglerVersion,
+							os: process.platform + ":" + process.arch,
 							a: 1,
 							b: 2,
 						},
@@ -139,6 +143,7 @@ describe("metrics", () => {
 						properties: {
 							category: "Workers",
 							wranglerVersion,
+							os: process.platform + ":" + process.arch,
 							a: 1,
 							b: 2,
 						},