wrangler 2.0.3 → 2.0.7

package/src/__tests__/kv.test.ts

@@ -48,10 +48,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace create <namespace>
+          wrangler kv:namespace create <namespace>
 
           Create a new namespace
 
@@ -65,8 +62,10 @@ describe("wrangler", () => {
 
           Options:
             -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
+                --preview  Interact with a preview namespace  [boolean]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
           "
         `);
@@ -80,10 +79,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace create <namespace>
+          wrangler kv:namespace create <namespace>
 
           Create a new namespace
 
@@ -97,8 +93,10 @@ describe("wrangler", () => {
 
           Options:
             -e, --env      Perform on a specific environment  [string]
-                --preview  Interact with a preview namespace  [boolean]
-          X [ERROR] Unknown arguments: def, ghi
+                --preview  Interact with a preview namespace  [boolean]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Unknown arguments: def, ghi
 
           "
         `);
@@ -113,10 +111,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace create <namespace>
+          wrangler kv:namespace create <namespace>
 
           Create a new namespace
 
@@ -130,8 +125,10 @@ describe("wrangler", () => {
 
           Options:
             -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.
+                --preview  Interact with a preview namespace  [boolean]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.
 
           "
         `);
@@ -257,14 +254,6 @@ describe("wrangler", () => {
         expect(requests.count).toEqual(1);
       });
 
-      it("should encode URI id properly for deleting namespace", async () => {
-        const requests = mockDeleteRequest("%2Fvoyager");
-        await runWrangler(`kv:namespace delete --namespace-id /voyager`);
-        expect(requests.count).toEqual(1);
-        expect(std.out).toMatchInlineSnapshot(`""`);
-        expect(std.err).toMatchInlineSnapshot(`""`);
-      });
-
       it("should delete a namespace specified by binding name", async () => {
         writeWranglerConfig();
         const requests = mockDeleteRequest("bound-id");
@@ -291,21 +280,7 @@ describe("wrangler", () => {
                 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]
-
-          Options:
-                --binding       The name of the namespace to delete  [string]
-                --namespace-id  The id of the namespace to delete  [string]
-            -e, --env           Perform on a specific environment  [string]
-                --preview       Interact with a preview namespace  [boolean]
-          X [ERROR] Not able to delete namespace.
+          "X [ERROR] Not able to delete namespace.
 
             A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
@@ -389,7 +364,7 @@ describe("wrangler", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
-      it("should encode URI key's properly for putting in a key request", async () => {
+      it("should encode the key in the api request to put a value", async () => {
         const requests = mockKeyPutRequest("DS9", {
           key: "%2Fmy-key",
           value: "my-value",
@@ -497,10 +472,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -520,8 +492,10 @@ describe("wrangler", () => {
                 --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
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
           "
         `);
@@ -536,10 +510,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -559,8 +530,10 @@ describe("wrangler", () => {
                 --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
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Exactly one of the arguments binding and namespace-id is required
 
           "
         `);
@@ -575,10 +548,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -598,8 +568,10 @@ describe("wrangler", () => {
                 --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
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Arguments binding and namespace-id are mutually exclusive
 
           "
         `);
@@ -614,10 +586,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -637,8 +606,10 @@ describe("wrangler", () => {
                 --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
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Exactly one of the arguments value and path is required
 
           "
         `);
@@ -653,10 +624,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -676,8 +644,10 @@ describe("wrangler", () => {
                 --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
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Arguments value and path are mutually exclusive
 
           "
         `);
@@ -951,6 +921,20 @@ describe("wrangler", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
+      it("should encode the key in the api request to get a value", async () => {
+        setMockFetchKVGetValue(
+          "some-account-id",
+          "some-namespace-id",
+          "%2Fmy%2Ckey",
+          "my-value"
+        );
+        await runWrangler(
+          "kv:key get /my,key --namespace-id some-namespace-id"
+        );
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
       it("should error if no key is provided", async () => {
         await expect(
           runWrangler("kv:key get")
@@ -959,10 +943,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key get <key>
+          wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
 
@@ -978,8 +959,10 @@ describe("wrangler", () => {
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [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
+                --preview       Interact with a preview namespace  [boolean] [default: false]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
           "
         `);
@@ -993,10 +976,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key get <key>
+          wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
 
@@ -1012,8 +992,10 @@ describe("wrangler", () => {
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [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
+                --preview       Interact with a preview namespace  [boolean] [default: false]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Exactly one of the arguments binding and namespace-id is required
 
           "
         `);
@@ -1028,10 +1010,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key get <key>
+          wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
 
@@ -1047,8 +1026,10 @@ describe("wrangler", () => {
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [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
+                --preview       Interact with a preview namespace  [boolean] [default: false]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Arguments binding and namespace-id are mutually exclusive
 
           "
         `);
@@ -1101,7 +1082,7 @@ describe("wrangler", () => {
         expect(requests.count).toEqual(1);
       });
 
-      it("should encode the URI properly for deleting a key requests", async () => {
+      it("should encode the key in the api request to delete a value", async () => {
         const requests = mockDeleteRequest("voyager", "%2FNCC-74656");
         await runWrangler(`kv:key delete --namespace-id voyager /NCC-74656`);
         expect(requests.count).toEqual(1);
@@ -1224,10 +1205,10 @@ describe("wrangler", () => {
         );
         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.
+          "Uploaded 0% (0 out of 12,000)
+          Uploaded 41% (5,000 out of 12,000)
+          Uploaded 83% (10,000 out of 12,000)
+          Uploaded 100% (12,000 out of 12,000)
           Success!"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -1256,7 +1237,25 @@ describe("wrangler", () => {
           "a string",
           { key: "someKey" },
           { value: "someValue" },
+          // add a valid object here to make sure it's not included
+          { key: "someKey1", value: "someValue1" },
+          // this one will only add a warning
           { key: "someKey1", value: "someValue1", invalid: true },
+          // back to the invalid ones
+          { key: 123, value: "somevalue" },
+          { key: "somekey", value: 123 },
+          { key: "someKey1", value: "someValue1", expiration: "string" },
+          { key: "someKey1", value: "someValue1", expiration_ttl: "string" },
+          {
+            key: 123,
+            value: {
+              a: {
+                nested: "object",
+              },
+            },
+          },
+          { key: "someKey1", value: "someValue1", metadata: 123 },
+          { key: "someKey1", value: "someValue1", base64: "string" },
         ];
         writeFileSync("./keys.json", JSON.stringify(keyValues));
         await expect(
@@ -1274,10 +1273,17 @@ describe("wrangler", () => {
                   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 0 is 123
+                The item at index 1 is \\"a string\\"
                 The item at index 2 is {\\"key\\":\\"someKey\\"}
-                The item at index 3 is {\\"value\\":\\"someValue\\"}"
+                The item at index 3 is {\\"value\\":\\"someValue\\"}
+                The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
+                The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
+                The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
+                The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
+                The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
+                The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
+                The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
               `);
 
         expect(std.out).toMatchInlineSnapshot(`
@@ -1287,7 +1293,7 @@ describe("wrangler", () => {
         expect(std.warn).toMatchInlineSnapshot(`
           "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
 
-            The item at index 4 contains unexpected properties: [\\"invalid\\"].
+            The item at index 5 contains unexpected properties: [\\"invalid\\"].
 
           "
         `);
@@ -1352,10 +1358,10 @@ describe("wrangler", () => {
         );
         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.
+          "Deleted 0% (0 out of 12,000)
+          Deleted 41% (5,000 out of 12,000)
+          Deleted 83% (10,000 out of 12,000)
+          Deleted 100% (12,000 out of 12,000)
           Success!"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);