wrangler 0.0.0-e5d3690 → 0.0.0-e88a54e

package/src/__tests__/kv.test.ts

@@ -1,16 +1,24 @@
-import { writeFileSync } from "fs";
-import type { KVNamespaceInfo } from "../kv";
+import { writeFileSync } from "node:fs";
+import { Headers } from "undici";
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
   setMockResponse,
-  setMockRawResponse,
   unsetAllMocks,
-  createFetchResult,
-} from "./mock-cfetch";
-import { runWrangler } from "./run-wrangler";
-import { runInTempDir } from "./run-in-tmp";
+  unsetMockFetchKVGetValues,
+  setMockFetchKVGetValue,
+} from "./helpers/mock-cfetch";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConfirm } from "./helpers/mock-dialogs";
+import { mockKeyListRequest } from "./helpers/mock-kv";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+import type { KeyValue, KVNamespaceInfo, NamespaceKeyInfo } from "../kv";
 
 describe("wrangler", () => {
+  mockAccountId();
+  mockApiToken();
   runInTempDir();
+  const std = mockConsoleMethods();
 
   afterEach(() => {
     unsetAllMocks();
@@ -32,11 +40,13 @@ describe("wrangler", () => {
       }
 
       it("should error if no namespace is given", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:namespace create"
+        await expect(
+          runWrangler("kv:namespace create")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Not enough non-option arguments: got 0, need at least 1"`
         );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:namespace create <namespace>
 
           Create a new namespace
@@ -45,28 +55,27 @@ describe("wrangler", () => {
             namespace  The name of the new namespace  [string] [required]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local    Run on my machine  [boolean] [default: false]
-                --env      Perform on a specific environment  [string]
+            -e, --env      Perform on a specific environment  [string]
                 --preview  Interact with a preview namespace  [boolean]
 
           Not enough non-option arguments: got 0, need at least 1"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Not enough non-option arguments: got 0, need at least 1]`
-        );
       });
 
       it("should error if the namespace to create contains spaces", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:namespace create abc def ghi"
+        await expect(
+          runWrangler("kv:namespace create abc def ghi")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Unexpected additional positional arguments \\"def ghi\\"."`
         );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:namespace create <namespace>
 
           Create a new namespace
@@ -75,28 +84,28 @@ describe("wrangler", () => {
             namespace  The name of the new namespace  [string] [required]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local    Run on my machine  [boolean] [default: false]
-                --env      Perform on a specific environment  [string]
+            -e, --env      Perform on a specific environment  [string]
                 --preview  Interact with a preview namespace  [boolean]
 
           Unexpected additional positional arguments \\"def ghi\\"."
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Unexpected additional positional arguments "def ghi".]`
-        );
       });
 
       it("should error if the namespace to create is not valid", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:namespace create abc-def"
+        await expect(
+          runWrangler("kv:namespace create abc-def")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number."`
         );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:namespace create <namespace>
 
           Create a new namespace
@@ -105,28 +114,23 @@ describe("wrangler", () => {
             namespace  The name of the new namespace  [string] [required]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local    Run on my machine  [boolean] [default: false]
-                --env      Perform on a specific environment  [string]
+            -e, --env      Perform on a specific environment  [string]
                 --preview  Interact with a preview namespace  [boolean]
 
           The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number."
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: The namespace binding name "abc-def" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.]`
-        );
       });
 
       it("should create a namespace", async () => {
         mockCreateRequest("worker-UnitTestNamespace");
-        const { stdout } = await runWrangler(
-          "kv:namespace create UnitTestNamespace"
-        );
-        expect(stdout).toMatchInlineSnapshot(`
+        await runWrangler("kv:namespace create UnitTestNamespace");
+        expect(std.out).toMatchInlineSnapshot(`
           "🌀 Creating namespace with title \\"worker-UnitTestNamespace\\"
           ✨ Success!
           Add the following to your configuration file in your kv_namespaces array:
@@ -136,10 +140,8 @@ describe("wrangler", () => {
 
       it("should create a preview namespace if configured to do so", async () => {
         mockCreateRequest("worker-UnitTestNamespace_preview");
-        const { stdout } = await runWrangler(
-          "kv:namespace create UnitTestNamespace --preview"
-        );
-        expect(stdout).toMatchInlineSnapshot(`
+        await runWrangler("kv:namespace create UnitTestNamespace --preview");
+        expect(std.out).toMatchInlineSnapshot(`
           "🌀 Creating namespace with title \\"worker-UnitTestNamespace_preview\\"
           ✨ Success!
           Add the following to your configuration file in your kv_namespaces array:
@@ -150,10 +152,8 @@ describe("wrangler", () => {
       it("should create a namespace using configured worker name", async () => {
         writeFileSync("./wrangler.toml", 'name = "otherWorker"', "utf-8");
         mockCreateRequest("otherWorker-UnitTestNamespace");
-        const { stdout } = await runWrangler(
-          "kv:namespace create UnitTestNamespace"
-        );
-        expect(stdout).toMatchInlineSnapshot(`
+        await runWrangler("kv:namespace create UnitTestNamespace");
+        expect(std.out).toMatchInlineSnapshot(`
             "🌀 Creating namespace with title \\"otherWorker-UnitTestNamespace\\"
             ✨ Success!
             Add the following to your configuration file in your kv_namespaces array:
@@ -163,10 +163,10 @@ describe("wrangler", () => {
 
       it("should create a namespace in an environment if configured to do so", async () => {
         mockCreateRequest("worker-customEnv-UnitTestNamespace");
-        const { stdout } = await runWrangler(
+        await runWrangler(
           "kv:namespace create UnitTestNamespace --env customEnv"
         );
-        expect(stdout).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`
           "🌀 Creating namespace with title \\"worker-customEnv-UnitTestNamespace\\"
           ✨ Success!
           Add the following to your configuration file in your kv_namespaces array under [env.customEnv]:
@@ -202,12 +202,10 @@ describe("wrangler", () => {
           { title: "title-2", id: "id-2" },
         ];
         mockListRequest(kvNamespaces);
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:namespace list"
-        );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        const namespaces = JSON.parse(stdout);
+        await runWrangler("kv:namespace list");
+
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        const namespaces = JSON.parse(std.out);
         expect(namespaces).toEqual(kvNamespaces);
       });
 
@@ -218,8 +216,8 @@ describe("wrangler", () => {
           kvNamespaces.push({ title: "title-" + i, id: "id-" + i });
         }
         const requests = mockListRequest(kvNamespaces);
-        const { stdout } = await runWrangler("kv:namespace list");
-        const namespaces = JSON.parse(stdout);
+        await runWrangler("kv:namespace list");
+        const namespaces = JSON.parse(std.out);
         expect(namespaces).toEqual(kvNamespaces);
         expect(requests.count).toEqual(6);
       });
@@ -269,24 +267,26 @@ describe("wrangler", () => {
 
       it("should error if a given binding name is not in the configured kv namespaces", async () => {
         writeWranglerConfig();
-        const { stderr } = await runWrangler(
-          `kv:namespace delete --binding otherBinding`
-        );
-        expect(stderr).toMatchInlineSnapshot(`
+        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\\"."
+              `);
+        expect(std.err).toMatchInlineSnapshot(`
           "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]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
                 --binding       The name of the namespace to delete  [string]
                 --namespace-id  The id of the namespace to delete  [string]
-                --env           Perform on a specific environment  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
 
           Not able to delete namespace.
@@ -297,12 +297,12 @@ describe("wrangler", () => {
       it("should delete a namespace specified by binding name in a given environment", async () => {
         writeWranglerConfig();
         const requests = mockDeleteRequest("env-bound-id");
-        const { stdout, stderr, error } = await runWrangler(
-          `kv:namespace delete --binding someBinding --env some-environment --preview false`
+        await runWrangler(
+          "kv:namespace delete --binding someBinding --env some-environment --preview false"
         );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
       });
 
@@ -321,10 +321,7 @@ describe("wrangler", () => {
     describe("put", () => {
       function mockKeyPutRequest(
         expectedNamespaceId: string,
-        expectedKey: string,
-        expectedValue: string,
-        expiration?: number,
-        expirationTtl?: number
+        expectedKV: KeyValue
       ) {
         const requests = { count: 0 };
         setMockResponse(
@@ -334,15 +331,19 @@ describe("wrangler", () => {
             requests.count++;
             expect(accountId).toEqual("some-account-id");
             expect(namespaceId).toEqual(expectedNamespaceId);
-            expect(key).toEqual(expectedKey);
-            expect(body).toEqual(expectedValue);
-            if (expiration !== undefined) {
-              expect(query.get("expiration")).toEqual(`${expiration}`);
+            expect(key).toEqual(expectedKV.key);
+            expect(body).toEqual(expectedKV.value);
+            if (expectedKV.expiration !== undefined) {
+              expect(query.get("expiration")).toEqual(
+                `${expectedKV.expiration}`
+              );
             } else {
               expect(query.has("expiration")).toBe(false);
             }
-            if (expirationTtl) {
-              expect(query.get("expiration_ttl")).toEqual(`${expirationTtl}`);
+            if (expectedKV.expiration_ttl) {
+              expect(query.get("expiration_ttl")).toEqual(
+                `${expectedKV.expiration_ttl}`
+              );
             } else {
               expect(query.has("expiration_ttl")).toBe(false);
             }
@@ -353,358 +354,345 @@ describe("wrangler", () => {
       }
 
       it("should put a key in a given namespace specified by namespace-id", async () => {
-        const requests = mockKeyPutRequest(
-          "some-namespace-id",
-          "my-key",
-          "my-value"
-        );
-        const { error, stderr, stdout } = await runWrangler(
+        const requests = mockKeyPutRequest("some-namespace-id", {
+          key: "my-key",
+          value: "my-value",
+        });
+
+        await runWrangler(
           "kv:key put my-key my-value --namespace-id some-namespace-id"
         );
+
         expect(requests.count).toEqual(1);
-        expect(stdout).toMatchInlineSnapshot(
+        expect(std.out).toMatchInlineSnapshot(
           `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
       it("should put a key in a given namespace specified by binding", async () => {
         writeWranglerConfig();
-        const requests = mockKeyPutRequest("bound-id", "my-key", "my-value");
-        const { error, stderr, stdout } = await runWrangler(
+        const requests = mockKeyPutRequest("bound-id", {
+          key: "my-key",
+          value: "my-value",
+        });
+        await runWrangler(
           "kv:key put my-key my-value --binding someBinding --preview false"
         );
-        expect(stdout).toMatchInlineSnapshot(
+
+        expect(std.out).toMatchInlineSnapshot(
           `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace bound-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
       });
 
       it("should put a key in a given preview namespace specified by binding", async () => {
         writeWranglerConfig();
-        const requests = mockKeyPutRequest(
-          "preview-bound-id",
-          "my-key",
-          "my-value"
-        );
-        const { error, stderr, stdout } = await runWrangler(
+        const requests = mockKeyPutRequest("preview-bound-id", {
+          key: "my-key",
+          value: "my-value",
+        });
+
+        await runWrangler(
           "kv:key put my-key my-value --binding someBinding --preview"
         );
-        expect(stdout).toMatchInlineSnapshot(
+
+        expect(std.out).toMatchInlineSnapshot(
           `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace preview-bound-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
       });
 
       it("should add expiration and ttl properties when putting a key", async () => {
-        const requests = mockKeyPutRequest(
-          "some-namespace-id",
-          "my-key",
-          "my-value",
-          10,
-          20
-        );
-        const { error, stderr, stdout } = await runWrangler(
+        const requests = mockKeyPutRequest("some-namespace-id", {
+          key: "my-key",
+          value: "my-value",
+          expiration: 10,
+          expiration_ttl: 20,
+        });
+        await runWrangler(
           "kv:key put my-key my-value --namespace-id some-namespace-id --expiration 10 --ttl 20"
         );
         expect(requests.count).toEqual(1);
-        expect(stdout).toMatchInlineSnapshot(
+        expect(std.out).toMatchInlineSnapshot(
           `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
       it("should put a key to the specified environment in a given namespace", async () => {
         writeWranglerConfig();
-        const requests = mockKeyPutRequest(
-          "env-bound-id",
-          "my-key",
-          "my-value"
-        );
-        const { error, stderr, stdout } = await runWrangler(
+        const requests = mockKeyPutRequest("env-bound-id", {
+          key: "my-key",
+          value: "my-value",
+        });
+        await runWrangler(
           "kv:key put my-key my-value --binding someBinding --env some-environment --preview false"
         );
-        expect(stdout).toMatchInlineSnapshot(
+        expect(std.out).toMatchInlineSnapshot(
           `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace env-bound-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
       });
 
       it("should put a key with a value loaded from a given path", async () => {
         writeFileSync("foo.txt", "file-contents", "utf-8");
-        const requests = mockKeyPutRequest(
-          "some-namespace-id",
-          "my-key",
-          "file-contents"
-        );
-        const { error, stderr, stdout } = await runWrangler(
+        const requests = mockKeyPutRequest("some-namespace-id", {
+          key: "my-key",
+          value: "file-contents",
+        });
+        await runWrangler(
           "kv:key put my-key --namespace-id some-namespace-id --path foo.txt"
         );
-        expect(stdout).toMatchInlineSnapshot(
+        expect(std.out).toMatchInlineSnapshot(
           `"writing the contents of foo.txt to the key \\"my-key\\" on namespace some-namespace-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
       });
 
       it("should error if no key is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler("kv:key put");
+        await expect(
+          runWrangler("kv:key put")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Not enough non-option arguments: got 0, need at least 1"`
+        );
 
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
           Positionals:
-            key    The key to write to.  [string] [required]
-            value  The value to write.  [string]
+            key    The key to write to  [string] [required]
+            value  The value to write  [string]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
-                --binding       The binding of the namespace to write to.  [string]
-                --namespace-id  The id of the namespace to write to.  [string]
-                --env           Perform on a specific environment  [string]
+                --binding       The binding of the namespace to write to  [string]
+                --namespace-id  The id of the namespace to write to  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
-                --ttl           Time for which the entries should be visible.  [number]
+                --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path.  [string]
+                --path          Read value from the file at a given path  [string]
 
           Not enough non-option arguments: got 0, need at least 1"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Not enough non-option arguments: got 0, need at least 1]`
-        );
       });
 
       it("should error if no binding nor namespace is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key put foo bar"
+        await expect(
+          runWrangler("kv:key put foo bar")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Exactly one of the arguments binding and namespace-id is required"`
         );
 
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
           Positionals:
-            key    The key to write to.  [string] [required]
-            value  The value to write.  [string]
+            key    The key to write to  [string] [required]
+            value  The value to write  [string]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
-                --binding       The binding of the namespace to write to.  [string]
-                --namespace-id  The id of the namespace to write to.  [string]
-                --env           Perform on a specific environment  [string]
+                --binding       The binding of the namespace to write to  [string]
+                --namespace-id  The id of the namespace to write to  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
-                --ttl           Time for which the entries should be visible.  [number]
+                --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path.  [string]
+                --path          Read value from the file at a given path  [string]
 
           Exactly one of the arguments binding and namespace-id is required"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Exactly one of the arguments binding and namespace-id is required]`
-        );
       });
 
       it("should error if both binding and namespace is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key put foo bar --binding x --namespace-id y"
+        await expect(
+          runWrangler("kv:key put foo bar --binding x --namespace-id y")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Arguments binding and namespace-id are mutually exclusive"`
         );
 
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
           Positionals:
-            key    The key to write to.  [string] [required]
-            value  The value to write.  [string]
+            key    The key to write to  [string] [required]
+            value  The value to write  [string]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
-                --binding       The binding of the namespace to write to.  [string]
-                --namespace-id  The id of the namespace to write to.  [string]
-                --env           Perform on a specific environment  [string]
+                --binding       The binding of the namespace to write to  [string]
+                --namespace-id  The id of the namespace to write to  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
-                --ttl           Time for which the entries should be visible.  [number]
+                --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path.  [string]
+                --path          Read value from the file at a given path  [string]
 
           Arguments binding and namespace-id are mutually exclusive"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Arguments binding and namespace-id are mutually exclusive]`
-        );
       });
 
       it("should error if no value nor path is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key put key --namespace-id 12345"
+        await expect(
+          runWrangler("kv:key put key --namespace-id 12345")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Exactly one of the arguments value and path is required"`
         );
 
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
           Positionals:
-            key    The key to write to.  [string] [required]
-            value  The value to write.  [string]
+            key    The key to write to  [string] [required]
+            value  The value to write  [string]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
-                --binding       The binding of the namespace to write to.  [string]
-                --namespace-id  The id of the namespace to write to.  [string]
-                --env           Perform on a specific environment  [string]
+                --binding       The binding of the namespace to write to  [string]
+                --namespace-id  The id of the namespace to write to  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
-                --ttl           Time for which the entries should be visible.  [number]
+                --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path.  [string]
+                --path          Read value from the file at a given path  [string]
 
           Exactly one of the arguments value and path is required"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Exactly one of the arguments value and path is required]`
-        );
       });
 
       it("should error if both value and path is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key put key value --path xyz --namespace-id 12345"
+        await expect(
+          runWrangler("kv:key put key value --path xyz --namespace-id 12345")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Arguments value and path are mutually exclusive"`
         );
 
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
           Positionals:
-            key    The key to write to.  [string] [required]
-            value  The value to write.  [string]
+            key    The key to write to  [string] [required]
+            value  The value to write  [string]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
-                --binding       The binding of the namespace to write to.  [string]
-                --namespace-id  The id of the namespace to write to.  [string]
-                --env           Perform on a specific environment  [string]
+                --binding       The binding of the namespace to write to  [string]
+                --namespace-id  The id of the namespace to write to  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
-                --ttl           Time for which the entries should be visible.  [number]
+                --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path.  [string]
+                --path          Read value from the file at a given path  [string]
 
           Arguments value and path are mutually exclusive"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Arguments value and path are mutually exclusive]`
-        );
       });
 
       it("should error if a given binding name is not in the configured kv namespaces", async () => {
         writeWranglerConfig();
-        const { error, stdout, stderr } = await runWrangler(
-          `kv:key put key value --binding otherBinding`
+        await expect(
+          runWrangler("kv:key put key value --binding otherBinding")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
-          %s
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: A namespace with binding name "otherBinding" was not found in the configured "kv_namespaces".]`
-        );
       });
 
       it("should error if a given binding has both preview and non-preview and --preview is not specified", async () => {
         writeWranglerConfig();
-        const requests = mockKeyPutRequest(
-          "preview-bound-id",
-          "my-key",
-          "my-value"
-        );
-        const { error, stderr, stdout } = await runWrangler(
-          "kv:key put my-key my-value --binding someBinding"
-        );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        const requests = mockKeyPutRequest("preview-bound-id", {
+          key: "my-key",
+          value: "my-value",
+        });
+        await expect(
+          runWrangler("kv:key put my-key my-value --binding someBinding")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace."`
+        );
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
 
-          %s
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: someBinding has both a namespace ID and a preview ID. Specify "--preview" or "--preview false" to avoid writing data to the wrong namespace.]`
-        );
         expect(requests.count).toEqual(0);
       });
     });
 
     describe("list", () => {
       it("should list the keys of a namespace specified by namespace-id", async () => {
-        const keys = ["key-1", "key-2", "key-3"];
+        const keys = [
+          { name: "key-1" },
+          { name: "key-2", expiration: 123456789 },
+          { name: "key-3", expiration_ttl: 666 },
+        ];
         mockKeyListRequest("some-namespace-id", keys);
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key list --namespace-id some-namespace-id"
-        );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(stdout).toMatchInlineSnapshot(`
+        await runWrangler("kv:key list --namespace-id some-namespace-id");
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
           "[
             {
-              \\"name\\": \\"key-1\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-1\\"
             },
             {
               \\"name\\": \\"key-2\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"expiration\\": 123456789
             },
             {
               \\"name\\": \\"key-3\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"expiration_ttl\\": 666
             }
           ]"
         `);
@@ -712,29 +700,21 @@ describe("wrangler", () => {
 
       it("should list the keys of a namespace specified by binding", async () => {
         writeWranglerConfig();
-        const keys = ["key-1", "key-2", "key-3"];
+        const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
         mockKeyListRequest("bound-id", keys);
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key list --binding someBinding"
-        );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(stdout).toMatchInlineSnapshot(`
+
+        await runWrangler("kv:key list --binding someBinding");
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
           "[
             {
-              \\"name\\": \\"key-1\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-1\\"
             },
             {
-              \\"name\\": \\"key-2\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-2\\"
             },
             {
-              \\"name\\": \\"key-3\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-3\\"
             }
           ]"
         `);
@@ -742,29 +722,20 @@ describe("wrangler", () => {
 
       it("should list the keys of a preview namespace specified by binding", async () => {
         writeWranglerConfig();
-        const keys = ["key-1", "key-2", "key-3"];
+        const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
         mockKeyListRequest("preview-bound-id", keys);
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key list --binding someBinding --preview"
-        );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(stdout).toMatchInlineSnapshot(`
+        await runWrangler("kv:key list --binding someBinding --preview");
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
           "[
             {
-              \\"name\\": \\"key-1\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-1\\"
             },
             {
-              \\"name\\": \\"key-2\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-2\\"
             },
             {
-              \\"name\\": \\"key-3\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-3\\"
             }
           ]"
         `);
@@ -772,29 +743,22 @@ describe("wrangler", () => {
 
       it("should list the keys of a namespace specified by binding, in a given environment", async () => {
         writeWranglerConfig();
-        const keys = ["key-1", "key-2", "key-3"];
+        const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
         mockKeyListRequest("env-bound-id", keys);
-        const { error, stdout, stderr } = await runWrangler(
+        await runWrangler(
           "kv:key list --binding someBinding --env some-environment"
         );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(stdout).toMatchInlineSnapshot(`
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
           "[
             {
-              \\"name\\": \\"key-1\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-1\\"
             },
             {
-              \\"name\\": \\"key-2\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-2\\"
             },
             {
-              \\"name\\": \\"key-3\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-3\\"
             }
           ]"
         `);
@@ -802,153 +766,143 @@ describe("wrangler", () => {
 
       it("should list the keys of a preview namespace specified by binding, in a given environment", async () => {
         writeWranglerConfig();
-        const keys = ["key-1", "key-2", "key-3"];
+        const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
         mockKeyListRequest("preview-env-bound-id", keys);
-        const { error, stdout, stderr } = await runWrangler(
+        await runWrangler(
           "kv:key list --binding someBinding --preview --env some-environment"
         );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(stdout).toMatchInlineSnapshot(`
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
           "[
             {
-              \\"name\\": \\"key-1\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-1\\"
             },
             {
-              \\"name\\": \\"key-2\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-2\\"
             },
             {
-              \\"name\\": \\"key-3\\",
-              \\"expiration\\": 123456789,
-              \\"metadata\\": {}
+              \\"name\\": \\"key-3\\"
             }
           ]"
         `);
       });
 
-      it("should make multiple requests for paginated results", async () => {
-        // Create a lot of mock keys, so that the fetch requests will be paginated
-        const keys: string[] = [];
-        for (let i = 0; i < 550; i++) {
-          keys.push("key-" + i);
-        }
-        // Ask for the keys in pages of size 100.
-        const requests = mockKeyListRequest("some-namespace-id", keys, 100);
-        const { stdout, stderr, error } = await runWrangler(
-          "kv:key list --namespace-id some-namespace-id --limit 100"
-        );
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(JSON.parse(stdout).map((k) => k.name)).toEqual(keys);
-        expect(requests.count).toEqual(6);
-      });
+      // We'll run the next test with variations on the cursor
+      // that's returned on cloudflare's API after all results
+      // have been drained.
+      for (const blankCursorValue of [undefined, null, ""] as [
+        undefined,
+        null,
+        ""
+      ]) {
+        describe(`cursor - ${blankCursorValue}`, () => {
+          it("should make multiple requests for paginated results", async () => {
+            // Create a lot of mock keys, so that the fetch requests will be paginated
+            const keys: NamespaceKeyInfo[] = [];
+            for (let i = 0; i < 550; i++) {
+              keys.push({ name: "key-" + i });
+            }
+            // Ask for the keys in pages of size 100.
+            const requests = mockKeyListRequest(
+              "some-namespace-id",
+              keys,
+              100,
+              blankCursorValue
+            );
+            await runWrangler(
+              "kv:key list --namespace-id some-namespace-id --limit 100"
+            );
+            expect(std.err).toMatchInlineSnapshot(`""`);
+            expect(JSON.parse(std.out)).toEqual(keys);
+            expect(requests.count).toEqual(6);
+          });
+        });
+      }
 
       it("should error if a given binding name is not in the configured kv namespaces", async () => {
         writeWranglerConfig();
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key list --binding otherBinding"
-        );
-        expect(error).toMatchInlineSnapshot(
-          `[Error: A namespace with binding name "otherBinding" was not found in the configured "kv_namespaces".]`
+        await expect(
+          runWrangler("kv:key list --binding otherBinding")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.err).toMatchInlineSnapshot(`
           "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
-          %s
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
-        expect(stdout).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`""`);
       });
     });
 
     describe("get", () => {
-      function mockKeyGetRequest(
-        expectedNamespaceId: string,
-        expectedKey: string,
-        expectedValue: string
-      ) {
-        const requests = { count: 0 };
-        setMockRawResponse(
-          "/accounts/:accountId/storage/kv/namespaces/:namespaceId/values/:key",
-          ([_url, accountId, namespaceId, key]) => {
-            requests.count++;
-            expect(accountId).toEqual("some-account-id");
-            expect(namespaceId).toEqual(expectedNamespaceId);
-            expect(key).toEqual(expectedKey);
-            return expectedValue;
-          }
-        );
-        return requests;
-      }
+      afterEach(() => {
+        unsetMockFetchKVGetValues();
+      });
 
       it("should get a key in a given namespace specified by namespace-id", async () => {
-        const requests = mockKeyGetRequest(
+        setMockFetchKVGetValue(
+          "some-account-id",
           "some-namespace-id",
           "my-key",
           "my-value"
         );
-        const { error, stderr, stdout } = await runWrangler(
-          "kv:key get my-key --namespace-id some-namespace-id"
-        );
-        expect(stdout).toMatchInlineSnapshot(`"my-value"`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(requests.count).toEqual(1);
+        await runWrangler("kv:key get my-key --namespace-id some-namespace-id");
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
       it("should get a key in a given namespace specified by binding", async () => {
         writeWranglerConfig();
-        const requests = mockKeyGetRequest("bound-id", "my-key", "my-value");
-        const { error, stderr, stdout } = await runWrangler(
+        setMockFetchKVGetValue(
+          "some-account-id",
+          "bound-id",
+          "my-key",
+          "my-value"
+        );
+        await runWrangler(
           "kv:key get my-key --binding someBinding --preview false"
         );
-        expect(stdout).toMatchInlineSnapshot(`"my-value"`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
       it("should get a key in a given preview namespace specified by binding", async () => {
         writeWranglerConfig();
-        const requests = mockKeyGetRequest(
+        setMockFetchKVGetValue(
+          "some-account-id",
           "preview-bound-id",
           "my-key",
           "my-value"
         );
-        const { error, stderr, stdout } = await runWrangler(
-          "kv:key get my-key --binding someBinding --preview"
-        );
-        expect(stdout).toMatchInlineSnapshot(`"my-value"`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(requests.count).toEqual(1);
+        await runWrangler("kv:key get my-key --binding someBinding --preview");
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
       it("should get a key for the specified environment in a given namespace", async () => {
         writeWranglerConfig();
-        const requests = mockKeyGetRequest(
+        setMockFetchKVGetValue(
+          "some-account-id",
           "env-bound-id",
           "my-key",
           "my-value"
         );
-        const { error, stderr, stdout } = await runWrangler(
+        await runWrangler(
           "kv:key get my-key my-value --binding someBinding --env some-environment --preview false"
         );
-        expect(stdout).toMatchInlineSnapshot(`"my-value"`);
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
-        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
       it("should error if no key is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler("kv:key get");
-
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        await expect(
+          runWrangler("kv:key get")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Not enough non-option arguments: got 0, need at least 1"`
+        );
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
@@ -957,29 +911,29 @@ describe("wrangler", () => {
             key  The key value to get.  [string] [required]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [string]
-                --env           Perform on a specific environment  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean] [default: false]
 
           Not enough non-option arguments: got 0, need at least 1"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Not enough non-option arguments: got 0, need at least 1]`
-        );
       });
 
       it("should error if no binding nor namespace is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler("kv:key get foo");
-
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        await expect(
+          runWrangler("kv:key get foo")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Exactly one of the arguments binding and namespace-id is required"`
+        );
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
@@ -988,31 +942,30 @@ describe("wrangler", () => {
             key  The key value to get.  [string] [required]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [string]
-                --env           Perform on a specific environment  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean] [default: false]
 
           Exactly one of the arguments binding and namespace-id is required"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Exactly one of the arguments binding and namespace-id is required]`
-        );
       });
 
       it("should error if both binding and namespace is provided", async () => {
-        const { error, stdout, stderr } = await runWrangler(
-          "kv:key get foo --binding x --namespace-id y"
+        await expect(
+          runWrangler("kv:key get foo --binding x --namespace-id y")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Arguments binding and namespace-id are mutually exclusive"`
         );
 
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
@@ -1021,39 +974,34 @@ describe("wrangler", () => {
             key  The key value to get.  [string] [required]
 
           Flags:
-            -c, --config   Path to .toml configuration file  [string]
-            -h, --help     Show help  [boolean]
-            -v, --version  Show version number  [boolean]
+            -c, --config      Path to .toml configuration file  [string]
+            -h, --help        Show help  [boolean]
+            -v, --version     Show version number  [boolean]
+                --legacy-env  Use legacy environments  [boolean]
 
           Options:
-            -l, --local         Run on my machine  [boolean] [default: false]
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [string]
-                --env           Perform on a specific environment  [string]
+            -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean] [default: false]
 
           Arguments binding and namespace-id are mutually exclusive"
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: Arguments binding and namespace-id are mutually exclusive]`
-        );
       });
 
       it("should error if a given binding name is not in the configured kv namespaces", async () => {
         writeWranglerConfig();
-        const { error, stdout, stderr } = await runWrangler(
-          `kv:key get key --binding otherBinding`
+        await expect(
+          runWrangler("kv:key get key --binding otherBinding")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
-        expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(`
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`
           "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
-          %s
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
-        expect(error).toMatchInlineSnapshot(
-          `[Error: A namespace with binding name "otherBinding" was not found in the configured "kv_namespaces".]`
-        );
       });
     });
 
@@ -1105,28 +1053,29 @@ describe("wrangler", () => {
 
       it("should error if a given binding name is not in the configured kv namespaces", async () => {
         writeWranglerConfig();
-        const { stderr } = await runWrangler(
-          `kv:key delete --binding otherBinding someKey`
+        await expect(
+          runWrangler(`kv:key delete --binding otherBinding someKey`)
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
-        expect(stderr).toMatchInlineSnapshot(`
+
+        expect(std.err).toMatchInlineSnapshot(`
           "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
-          %s
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
       });
 
       it("should delete a key in a namespace specified by binding name in a given environment", async () => {
         writeWranglerConfig();
         const requests = mockDeleteRequest("env-bound-id", "someKey");
-        const { stdout, stderr, error } = await runWrangler(
+        await runWrangler(
           `kv:key delete --binding someBinding --env some-environment --preview false someKey`
         );
-        expect(stdout).toMatchInlineSnapshot(
+        expect(std.out).toMatchInlineSnapshot(
           `"deleting the key \\"someKey\\" on namespace env-bound-id"`
         );
-        expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(error).toMatchInlineSnapshot(`undefined`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
       });
 
@@ -1140,6 +1089,278 @@ describe("wrangler", () => {
       });
     });
   });
+
+  describe("kv:bulk", () => {
+    describe("put", () => {
+      function mockPutRequest(
+        expectedNamespaceId: string,
+        expectedKeyValues: KeyValue[]
+      ) {
+        const requests = { count: 0 };
+        setMockResponse(
+          "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
+          "PUT",
+          ([_url, accountId, namespaceId], { body }) => {
+            requests.count++;
+            expect(accountId).toEqual("some-account-id");
+            expect(namespaceId).toEqual(expectedNamespaceId);
+            expect(JSON.parse(body as string)).toEqual(
+              expectedKeyValues.slice(
+                (requests.count - 1) * 5000,
+                requests.count * 5000
+              )
+            );
+            return null;
+          }
+        );
+        return requests;
+      }
+
+      it("should put the key-values parsed from a file", async () => {
+        const keyValues: KeyValue[] = [
+          { key: "someKey1", value: "someValue1" },
+          { key: "ns:someKey2", value: "123", base64: true },
+          { key: "someKey3", value: "someValue3", expiration: 100 },
+          { key: "someKey4", value: "someValue4", expiration_ttl: 500 },
+        ];
+        writeFileSync("./keys.json", JSON.stringify(keyValues));
+        const requests = mockPutRequest("some-namespace-id", keyValues);
+        await runWrangler(
+          `kv:bulk put --namespace-id some-namespace-id keys.json`
+        );
+        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(`"Success!"`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should put the key-values in batches of 5000 parsed from a file", async () => {
+        const keyValues: KeyValue[] = new Array(12000).fill({
+          key: "someKey1",
+          value: "someValue1",
+        });
+        writeFileSync("./keys.json", JSON.stringify(keyValues));
+        const requests = mockPutRequest("some-namespace-id", keyValues);
+        await runWrangler(
+          `kv:bulk put --namespace-id some-namespace-id keys.json`
+        );
+        expect(requests.count).toEqual(3);
+        expect(std.out).toMatchInlineSnapshot(`
+          "Uploaded 0 of 12000.
+          Uploaded 5000 of 12000.
+          Uploaded 10000 of 12000.
+          Uploaded 12000 of 12000.
+          Success!"
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error if the file is not a JSON array", async () => {
+        const keyValues = { key: "someKey1", value: "someValue1" };
+        writeFileSync("./keys.json", JSON.stringify(keyValues));
+        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\\"."
+              `);
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error if the array contains items that are not key-value objects", async () => {
+        const keyValues = [
+          123,
+          "a string",
+          { key: "someKey" },
+          { value: "someValue" },
+          { key: "someKey1", value: "someValue1", invalid: true },
+        ];
+        writeFileSync("./keys.json", JSON.stringify(keyValues));
+        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 type: \\"number\\" - 123
+                The item at index 1 is type: \\"string\\" - \\"a string\\"
+                The item at index 2 is {\\"key\\":\\"someKey\\"}
+                The item at index 3 is {\\"value\\":\\"someValue\\"}"
+              `);
+
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`
+          "Unexpected key-value properties in \\"keys.json\\".
+          The item at index 4 contains unexpected properties: [\\"invalid\\"]."
+        `);
+      });
+    });
+
+    describe("delete", () => {
+      function mockDeleteRequest(
+        expectedNamespaceId: string,
+        expectedKeys: string[]
+      ) {
+        const requests = { count: 0 };
+        setMockResponse(
+          "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
+          "DELETE",
+          ([_url, accountId, namespaceId], { headers, body }) => {
+            requests.count++;
+            expect(accountId).toEqual("some-account-id");
+            expect(namespaceId).toEqual(expectedNamespaceId);
+            expect(new Headers(headers ?? []).get("Content-Type")).toEqual(
+              "application/json"
+            );
+            expect(JSON.parse(body as string)).toEqual(
+              expectedKeys.slice(
+                (requests.count - 1) * 5000,
+                requests.count * 5000
+              )
+            );
+            return null;
+          }
+        );
+        return requests;
+      }
+
+      it("should delete the keys parsed from a file", async () => {
+        const keys = ["someKey1", "ns:someKey2"];
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        mockConfirm({
+          text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
+          result: true,
+        });
+        const requests = mockDeleteRequest("some-namespace-id", keys);
+        await runWrangler(
+          `kv:bulk delete --namespace-id some-namespace-id keys.json`
+        );
+        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(`"Success!"`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should delete the keys in batches of 5000 parsed from a file", async () => {
+        const keys = new Array(12000).fill("some-key");
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        mockConfirm({
+          text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
+          result: true,
+        });
+        const requests = mockDeleteRequest("some-namespace-id", keys);
+        await runWrangler(
+          `kv:bulk delete --namespace-id some-namespace-id keys.json`
+        );
+        expect(requests.count).toEqual(3);
+        expect(std.out).toMatchInlineSnapshot(`
+          "Deleted 0 of 12000.
+          Deleted 5000 of 12000.
+          Deleted 10000 of 12000.
+          Deleted 12000 of 12000.
+          Success!"
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should not delete the keys if the user confirms no", async () => {
+        const keys = ["someKey1", "ns:someKey2"];
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        mockConfirm({
+          text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
+          result: false,
+        });
+        await runWrangler(
+          `kv:bulk delete --namespace-id some-namespace-id keys.json`
+        );
+        expect(std.out).toMatchInlineSnapshot(
+          `"Not deleting keys read from \\"keys.json\\"."`
+        );
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should delete the keys without asking if --force is provided", async () => {
+        const keys = ["someKey1", "ns:someKey2"];
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        const requests = mockDeleteRequest("some-namespace-id", keys);
+        await runWrangler(
+          `kv:bulk delete --namespace-id some-namespace-id keys.json --force`
+        );
+        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(`"Success!"`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should delete the keys without asking if -f is provided", async () => {
+        const keys = ["someKey1", "ns:someKey2"];
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        const requests = mockDeleteRequest("some-namespace-id", keys);
+        await runWrangler(
+          `kv:bulk delete --namespace-id some-namespace-id keys.json -f`
+        );
+        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(`"Success!"`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error if the file is not a JSON array", async () => {
+        const keys = 12354;
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        mockConfirm({
+          text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
+          result: true,
+        });
+        await expect(
+          runWrangler(
+            `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"
+              `);
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error if the file contains non-string items", async () => {
+        const keys = ["good", 12354, { key: "someKey" }, null];
+        writeFileSync("./keys.json", JSON.stringify(keys));
+        mockConfirm({
+          text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
+          result: true,
+        });
+        await expect(
+          runWrangler(
+            `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"
+              `);
+        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+    });
+  });
 });
 
 function writeWranglerConfig() {
@@ -1159,41 +1380,3 @@ function writeWranglerConfig() {
     "utf-8"
   );
 }
-
-export function mockKeyListRequest(
-  expectedNamespaceId: string,
-  expectedKeys: string[],
-  keysPerRequest = 1000
-) {
-  const requests = { count: 0 };
-  // See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
-  const expectedKeyObjects = expectedKeys.map((name) => ({
-    name,
-    expiration: 123456789,
-    metadata: {},
-  }));
-  setMockRawResponse(
-    "/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
-    "GET",
-    ([_url, accountId, namespaceId], _init, query) => {
-      requests.count++;
-      expect(accountId).toEqual("some-account-id");
-      expect(namespaceId).toEqual(expectedNamespaceId);
-      if (expectedKeyObjects.length <= keysPerRequest) {
-        return createFetchResult(expectedKeyObjects);
-      } else {
-        const start = parseInt(query.get("cursor") ?? "0") || 0;
-        const end = start + keysPerRequest;
-        const cursor = end < expectedKeyObjects.length ? end : undefined;
-        return createFetchResult(
-          expectedKeyObjects.slice(start, end),
-          true,
-          [],
-          [],
-          { cursor }
-        );
-      }
-    }
-  );
-  return requests;
-}