wrangler 0.0.0-e043479 → 0.0.0-e0a0509

package/src/__tests__/kv.test.ts

@@ -8,7 +8,7 @@ import {
   setMockFetchKVGetValue,
 } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { mockConfirm } from "./helpers/mock-dialogs";
+import { clearConfirmMocks, mockConfirm } from "./helpers/mock-dialogs";
 import { mockKeyListRequest } from "./helpers/mock-kv";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
@@ -22,6 +22,7 @@ describe("wrangler", () => {
 
   afterEach(() => {
     unsetAllMocks();
+    clearConfirmMocks();
   });
 
   describe("kv:namespace", () => {
@@ -45,7 +46,10 @@ describe("wrangler", () => {
         ).rejects.toThrowErrorMatchingInlineSnapshot(
           `"Not enough non-option arguments: got 0, need at least 1"`
         );
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:namespace create <namespace>
 
@@ -55,16 +59,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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
-                --env      Perform on a specific environment  [string]
+            -e, --env      Perform on a specific environment  [string]
                 --preview  Interact with a preview namespace  [boolean]
+          X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
-          Not enough non-option arguments: got 0, need at least 1"
+          "
         `);
       });
 
@@ -72,9 +76,12 @@ 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.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:namespace create <namespace>
 
@@ -84,16 +91,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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
-                --env      Perform on a specific environment  [string]
+            -e, --env      Perform on a specific environment  [string]
                 --preview  Interact with a preview namespace  [boolean]
+          X [ERROR] Unknown arguments: def, ghi
 
-          Unexpected additional positional arguments \\"def ghi\\"."
+          "
         `);
       });
 
@@ -104,7 +111,10 @@ describe("wrangler", () => {
           `"The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number."`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:namespace create <namespace>
 
@@ -114,16 +124,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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
-                --env      Perform on a specific environment  [string]
+            -e, --env      Perform on a specific environment  [string]
                 --preview  Interact with a preview namespace  [boolean]
+          X [ERROR] The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.
 
-          The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number."
+          "
         `);
       });
 
@@ -150,11 +160,11 @@ describe("wrangler", () => {
       });
 
       it("should create a namespace using configured worker name", async () => {
-        writeFileSync("./wrangler.toml", 'name = "otherWorker"', "utf-8");
-        mockCreateRequest("otherWorker-UnitTestNamespace");
+        writeFileSync("./wrangler.toml", 'name = "other-worker"', "utf-8");
+        mockCreateRequest("other-worker-UnitTestNamespace");
         await runWrangler("kv:namespace create UnitTestNamespace");
         expect(std.out).toMatchInlineSnapshot(`
-            "🌀 Creating namespace with title \\"otherWorker-UnitTestNamespace\\"
+            "🌀 Creating namespace with title \\"other-worker-UnitTestNamespace\\"
             ✨ Success!
             Add the following to your configuration file in your kv_namespaces array:
             { binding = \\"UnitTestNamespace\\", id = \\"some-namespace-id\\" }"
@@ -278,19 +288,20 @@ 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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+          X [ERROR] Not able to delete namespace.
 
-          Not able to delete namespace.
-          A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
+            A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+
+          "
         `);
       });
 
@@ -365,7 +376,7 @@ describe("wrangler", () => {
 
         expect(requests.count).toEqual(1);
         expect(std.out).toMatchInlineSnapshot(
-          `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id"`
+          `"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
@@ -381,7 +392,7 @@ describe("wrangler", () => {
         );
 
         expect(std.out).toMatchInlineSnapshot(
-          `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace bound-id"`
+          `"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace bound-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
@@ -399,7 +410,7 @@ describe("wrangler", () => {
         );
 
         expect(std.out).toMatchInlineSnapshot(
-          `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace preview-bound-id"`
+          `"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace preview-bound-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
@@ -417,7 +428,7 @@ describe("wrangler", () => {
         );
         expect(requests.count).toEqual(1);
         expect(std.out).toMatchInlineSnapshot(
-          `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id"`
+          `"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
@@ -432,7 +443,7 @@ describe("wrangler", () => {
           "kv:key put my-key my-value --binding someBinding --env some-environment --preview false"
         );
         expect(std.out).toMatchInlineSnapshot(
-          `"writing the value \\"my-value\\" to key \\"my-key\\" on namespace env-bound-id"`
+          `"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace env-bound-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
@@ -448,7 +459,7 @@ describe("wrangler", () => {
           "kv:key put my-key --namespace-id some-namespace-id --path foo.txt"
         );
         expect(std.out).toMatchInlineSnapshot(
-          `"writing the contents of foo.txt to the key \\"my-key\\" on namespace some-namespace-id"`
+          `"Writing the contents of foo.txt to the key \\"my-key\\" on namespace some-namespace-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
@@ -461,7 +472,10 @@ describe("wrangler", () => {
           `"Not enough non-option arguments: got 0, need at least 1"`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
@@ -472,21 +486,21 @@ describe("wrangler", () => {
             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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+            -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]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
                 --path          Read value from the file at a given path  [string]
+          X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
-          Not enough non-option arguments: got 0, need at least 1"
+          "
         `);
       });
 
@@ -497,7 +511,10 @@ describe("wrangler", () => {
           `"Exactly one of the arguments binding and namespace-id is required"`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
@@ -508,21 +525,21 @@ describe("wrangler", () => {
             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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+            -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]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
                 --path          Read value from the file at a given path  [string]
+          X [ERROR] Exactly one of the arguments binding and namespace-id is required
 
-          Exactly one of the arguments binding and namespace-id is required"
+          "
         `);
       });
 
@@ -533,7 +550,10 @@ describe("wrangler", () => {
           `"Arguments binding and namespace-id are mutually exclusive"`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
@@ -544,21 +564,21 @@ describe("wrangler", () => {
             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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+            -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]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
                 --path          Read value from the file at a given path  [string]
+          X [ERROR] Arguments binding and namespace-id are mutually exclusive
 
-          Arguments binding and namespace-id are mutually exclusive"
+          "
         `);
       });
 
@@ -569,7 +589,10 @@ describe("wrangler", () => {
           `"Exactly one of the arguments value and path is required"`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
@@ -580,21 +603,21 @@ describe("wrangler", () => {
             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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+            -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]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
                 --path          Read value from the file at a given path  [string]
+          X [ERROR] Exactly one of the arguments value and path is required
 
-          Exactly one of the arguments value and path is required"
+          "
         `);
       });
 
@@ -605,7 +628,10 @@ describe("wrangler", () => {
           `"Arguments value and path are mutually exclusive"`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key put <key> [value]
 
@@ -616,21 +642,21 @@ describe("wrangler", () => {
             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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+            -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]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
                 --path          Read value from the file at a given path  [string]
+          X [ERROR] Arguments value and path are mutually exclusive
 
-          Arguments value and path are mutually exclusive"
+          "
         `);
       });
 
@@ -642,11 +668,14 @@ describe("wrangler", () => {
           `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.err).toMatchInlineSnapshot(`
-          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+          "X [ERROR] 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."
+          "
         `);
       });
 
@@ -661,11 +690,14 @@ describe("wrangler", () => {
         ).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.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         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.
+          "X [ERROR] 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."
+          "
         `);
         expect(requests.count).toEqual(0);
       });
@@ -673,26 +705,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
             }
           ]"
         `);
@@ -700,7 +732,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");
@@ -708,19 +740,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\\"
             }
           ]"
         `);
@@ -728,26 +754,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\\"
             }
           ]"
         `);
@@ -755,7 +775,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"
@@ -764,19 +784,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\\"
             }
           ]"
         `);
@@ -784,7 +798,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"
@@ -793,19 +807,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\\"
             }
           ]"
         `);
@@ -822,9 +830,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(
@@ -833,13 +841,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: NamespaceKeyInfo) => k.name)
-            ).toEqual(keys);
+            expect(JSON.parse(std.out)).toEqual(keys);
             expect(requests.count).toEqual(6);
           });
         });
@@ -853,11 +857,14 @@ describe("wrangler", () => {
           `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
         expect(std.err).toMatchInlineSnapshot(`
-          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+          "X [ERROR] 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."
+          "
+        `);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
-        expect(std.out).toMatchInlineSnapshot(`""`);
       });
     });
 
@@ -915,7 +922,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(`""`);
@@ -927,7 +934,10 @@ describe("wrangler", () => {
         ).rejects.toThrowErrorMatchingInlineSnapshot(
           `"Not enough non-option arguments: got 0, need at least 1"`
         );
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key get <key>
 
@@ -937,18 +947,18 @@ 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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+          X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
-          Not enough non-option arguments: got 0, need at least 1"
+          "
         `);
       });
 
@@ -958,7 +968,10 @@ describe("wrangler", () => {
         ).rejects.toThrowErrorMatchingInlineSnapshot(
           `"Exactly one of the arguments binding and namespace-id is required"`
         );
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key get <key>
 
@@ -968,18 +981,18 @@ 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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+          X [ERROR] Exactly one of the arguments binding and namespace-id is required
 
-          Exactly one of the arguments binding and namespace-id is required"
+          "
         `);
       });
 
@@ -990,7 +1003,10 @@ describe("wrangler", () => {
           `"Arguments binding and namespace-id are mutually exclusive"`
         );
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          "
+        `);
         expect(std.err).toMatchInlineSnapshot(`
           "wrangler kv:key get <key>
 
@@ -1000,18 +1016,18 @@ 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]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --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]
+          X [ERROR] Arguments binding and namespace-id are mutually exclusive
 
-          Arguments binding and namespace-id are mutually exclusive"
+          "
         `);
       });
 
@@ -1022,11 +1038,14 @@ describe("wrangler", () => {
         ).rejects.toThrowErrorMatchingInlineSnapshot(
           `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
         );
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.err).toMatchInlineSnapshot(`
-          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+          "X [ERROR] 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."
+          "
         `);
       });
     });
@@ -1086,9 +1105,9 @@ describe("wrangler", () => {
         );
 
         expect(std.err).toMatchInlineSnapshot(`
-          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+          "X [ERROR] 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."
+          "
         `);
       });
 
@@ -1099,7 +1118,7 @@ describe("wrangler", () => {
           `kv:key delete --binding someBinding --env some-environment --preview false someKey`
         );
         expect(std.out).toMatchInlineSnapshot(
-          `"deleting the key \\"someKey\\" on namespace env-bound-id"`
+          `"Deleting the key \\"someKey\\" on namespace env-bound-id."`
         );
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(requests.count).toEqual(1);
@@ -1191,7 +1210,10 @@ describe("wrangler", () => {
                 "Unexpected JSON input from \\"keys.json\\".
                 Expected an array of key-value objects but got type \\"object\\"."
               `);
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
 
@@ -1225,10 +1247,16 @@ describe("wrangler", () => {
                 The item at index 3 is {\\"value\\":\\"someValue\\"}"
               `);
 
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.warn).toMatchInlineSnapshot(`
-          "Unexpected key-value properties in \\"keys.json\\".
-          The item at index 4 contains unexpected properties: [\\"invalid\\"]."
+          "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
+
+            The item at index 4 contains unexpected properties: [\\"invalid\\"].
+
+          "
         `);
       });
     });
@@ -1360,7 +1388,10 @@ describe("wrangler", () => {
                 Expected an array of strings but got:
                 12354"
               `);
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
 
@@ -1382,7 +1413,10 @@ describe("wrangler", () => {
                 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.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
     });
@@ -1393,7 +1427,7 @@ function writeWranglerConfig() {
   writeFileSync(
     "./wrangler.toml",
     [
-      'name = "otherWorker"',
+      'name = "other-worker"',
       "kv_namespaces = [",
       '  { binding = "someBinding", id = "bound-id", preview_id = "preview-bound-id" }',
       "]",