wrangler 0.0.0-e2a26a0 → 0.0.0-e3e3243

package/src/__tests__/kv.test.ts

@@ -1,4 +1,5 @@
 import { writeFileSync } from "node:fs";
+import { Headers } from "undici";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
   setMockResponse,
@@ -7,10 +8,11 @@ import {
   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 { KVNamespaceInfo } from "../kv";
+import type { KeyValue, KVNamespaceInfo, NamespaceKeyInfo } from "../kv";
 
 describe("wrangler", () => {
   mockAccountId();
@@ -53,13 +55,13 @@ 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"
@@ -70,7 +72,7 @@ describe("wrangler", () => {
         await expect(
           runWrangler("kv:namespace create abc def ghi")
         ).rejects.toThrowErrorMatchingInlineSnapshot(
-          `"Unexpected additional positional arguments \\"def ghi\\"."`
+          `"Unknown arguments: def, ghi"`
         );
         expect(std.out).toMatchInlineSnapshot(`""`);
         expect(std.err).toMatchInlineSnapshot(`
@@ -82,16 +84,16 @@ 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\\"."
+          Unknown arguments: def, ghi"
         `);
       });
 
@@ -112,13 +114,13 @@ 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."
@@ -276,15 +278,15 @@ describe("wrangler", () => {
           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.
@@ -319,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(
@@ -332,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);
             }
@@ -351,11 +354,10 @@ 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 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"
@@ -370,7 +372,10 @@ describe("wrangler", () => {
 
       it("should put a key in a given namespace specified by binding", async () => {
         writeWranglerConfig();
-        const requests = mockKeyPutRequest("bound-id", "my-key", "my-value");
+        const requests = mockKeyPutRequest("bound-id", {
+          key: "my-key",
+          value: "my-value",
+        });
         await runWrangler(
           "kv:key put my-key my-value --binding someBinding --preview false"
         );
@@ -384,11 +389,10 @@ describe("wrangler", () => {
 
       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 requests = mockKeyPutRequest("preview-bound-id", {
+          key: "my-key",
+          value: "my-value",
+        });
 
         await runWrangler(
           "kv:key put my-key my-value --binding someBinding --preview"
@@ -402,13 +406,12 @@ describe("wrangler", () => {
       });
 
       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 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"
         );
@@ -421,11 +424,10 @@ describe("wrangler", () => {
 
       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 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"
         );
@@ -438,11 +440,10 @@ describe("wrangler", () => {
 
       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 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"
         );
@@ -467,23 +468,23 @@ describe("wrangler", () => {
           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"
         `);
@@ -503,23 +504,23 @@ describe("wrangler", () => {
           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"
         `);
@@ -539,23 +540,23 @@ describe("wrangler", () => {
           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"
         `);
@@ -575,23 +576,23 @@ describe("wrangler", () => {
           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"
         `);
@@ -611,23 +612,23 @@ describe("wrangler", () => {
           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"
         `);
@@ -645,18 +646,16 @@ describe("wrangler", () => {
         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 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 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(
@@ -666,8 +665,7 @@ describe("wrangler", () => {
         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(requests.count).toEqual(0);
       });
@@ -675,26 +673,26 @@ describe("wrangler", () => {
 
     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);
         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
             }
           ]"
         `);
@@ -702,7 +700,7 @@ 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);
 
         await runWrangler("kv:key list --binding someBinding");
@@ -710,19 +708,13 @@ describe("wrangler", () => {
         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\\"
             }
           ]"
         `);
@@ -730,26 +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);
         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\\"
             }
           ]"
         `);
@@ -757,7 +743,7 @@ 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);
         await runWrangler(
           "kv:key list --binding someBinding --env some-environment"
@@ -766,19 +752,13 @@ describe("wrangler", () => {
         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\\"
             }
           ]"
         `);
@@ -786,7 +766,7 @@ 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);
         await runWrangler(
           "kv:key list --binding someBinding --preview --env some-environment"
@@ -795,19 +775,13 @@ describe("wrangler", () => {
         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\\"
             }
           ]"
         `);
@@ -824,9 +798,9 @@ describe("wrangler", () => {
         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: string[] = [];
+            const keys: NamespaceKeyInfo[] = [];
             for (let i = 0; i < 550; i++) {
-              keys.push("key-" + i);
+              keys.push({ name: "key-" + i });
             }
             // Ask for the keys in pages of size 100.
             const requests = mockKeyListRequest(
@@ -835,11 +809,9 @@ describe("wrangler", () => {
               100,
               blankCursorValue
             );
-            await runWrangler(
-              "kv:key list --namespace-id some-namespace-id --limit 100"
-            );
+            await runWrangler("kv:key list --namespace-id some-namespace-id");
             expect(std.err).toMatchInlineSnapshot(`""`);
-            expect(JSON.parse(std.out).map((k) => k.name)).toEqual(keys);
+            expect(JSON.parse(std.out)).toEqual(keys);
             expect(requests.count).toEqual(6);
           });
         });
@@ -855,8 +827,7 @@ describe("wrangler", () => {
         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(std.out).toMatchInlineSnapshot(`""`);
       });
@@ -916,7 +887,7 @@ describe("wrangler", () => {
           "my-value"
         );
         await runWrangler(
-          "kv:key get my-key my-value --binding someBinding --env some-environment --preview false"
+          "kv:key get my-key --binding someBinding --env some-environment --preview false"
         );
         expect(std.out).toMatchInlineSnapshot(`"my-value"`);
         expect(std.err).toMatchInlineSnapshot(`""`);
@@ -938,15 +909,15 @@ 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"
@@ -969,15 +940,15 @@ 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"
@@ -1001,15 +972,15 @@ 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"
@@ -1027,8 +998,7 @@ describe("wrangler", () => {
         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."
         `);
       });
     });
@@ -1090,8 +1060,7 @@ describe("wrangler", () => {
         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."
         `);
       });
 
@@ -1118,6 +1087,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() {