wrangler 0.0.0-e3cab74 → 0.0.0-e3ce82b

package/src/__tests__/r2.test.ts

@@ -17,6 +17,33 @@ describe("wrangler", () => {
 
   describe("r2", () => {
     describe("bucket", () => {
+      it("should show the correct help when an invalid command is passed", async () => {
+        await expect(() =>
+          runWrangler("r2 bucket foo")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(`"Unknown argument: foo"`);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Unknown argument: foo
+
+          "
+        `);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          wrangler r2 bucket
+
+          Manage R2 buckets
+
+          Commands:
+            wrangler r2 bucket create <name>  Create a new R2 bucket
+            wrangler r2 bucket list           List R2 buckets
+            wrangler r2 bucket delete <name>  Delete an R2 bucket
+
+          Flags:
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]"
+        `);
+      });
+
       describe("list", () => {
         function mockListRequest(buckets: R2BucketInfo[]) {
           const requests = { count: 0 };
@@ -67,9 +94,9 @@ describe("wrangler", () => {
           ).rejects.toThrowErrorMatchingInlineSnapshot(
             `"Not enough non-option arguments: got 0, need at least 1"`
           );
-          expect(std.out).toMatchInlineSnapshot(`""`);
-          expect(std.err).toMatchInlineSnapshot(`
-            "wrangler r2 bucket create <name>
+          expect(std.out).toMatchInlineSnapshot(`
+            "
+            wrangler r2 bucket create <name>
 
             Create a new R2 bucket
 
@@ -77,12 +104,14 @@ describe("wrangler", () => {
               name  The name of the new bucket  [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]"
+          `);
+          expect(std.err).toMatchInlineSnapshot(`
+            "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
-            Not enough non-option arguments: got 0, need at least 1"
+            "
           `);
         });
 
@@ -90,11 +119,11 @@ describe("wrangler", () => {
           await expect(
             runWrangler("r2 bucket create abc def ghi")
           ).rejects.toThrowErrorMatchingInlineSnapshot(
-            `"Unexpected additional positional arguments \\"def ghi\\"."`
+            `"Unknown arguments: def, ghi"`
           );
-          expect(std.out).toMatchInlineSnapshot(`""`);
-          expect(std.err).toMatchInlineSnapshot(`
-            "wrangler r2 bucket create <name>
+          expect(std.out).toMatchInlineSnapshot(`
+            "
+            wrangler r2 bucket create <name>
 
             Create a new R2 bucket
 
@@ -102,12 +131,14 @@ describe("wrangler", () => {
               name  The name of the new bucket  [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]"
+          `);
+          expect(std.err).toMatchInlineSnapshot(`
+            "X [ERROR] Unknown arguments: def, ghi
 
-            Unexpected additional positional arguments \\"def ghi\\"."
+            "
           `);
         });
 
@@ -143,9 +174,9 @@ describe("wrangler", () => {
           ).rejects.toThrowErrorMatchingInlineSnapshot(
             `"Not enough non-option arguments: got 0, need at least 1"`
           );
-          expect(std.out).toMatchInlineSnapshot(`""`);
-          expect(std.err).toMatchInlineSnapshot(`
-            "wrangler r2 bucket delete <name>
+          expect(std.out).toMatchInlineSnapshot(`
+            "
+            wrangler r2 bucket delete <name>
 
             Delete an R2 bucket
 
@@ -153,12 +184,14 @@ describe("wrangler", () => {
               name  The name of the bucket to delete  [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]"
+          `);
+          expect(std.err).toMatchInlineSnapshot(`
+            "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
-            Not enough non-option arguments: got 0, need at least 1"
+            "
           `);
         });
 
@@ -166,11 +199,11 @@ describe("wrangler", () => {
           await expect(
             runWrangler("r2 bucket delete abc def ghi")
           ).rejects.toThrowErrorMatchingInlineSnapshot(
-            `"Unexpected additional positional arguments \\"def ghi\\"."`
+            `"Unknown arguments: def, ghi"`
           );
-          expect(std.out).toMatchInlineSnapshot(`""`);
-          expect(std.err).toMatchInlineSnapshot(`
-            "wrangler r2 bucket delete <name>
+          expect(std.out).toMatchInlineSnapshot(`
+            "
+            wrangler r2 bucket delete <name>
 
             Delete an R2 bucket
 
@@ -178,12 +211,14 @@ describe("wrangler", () => {
               name  The name of the bucket to delete  [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]"
+          `);
+          expect(std.err).toMatchInlineSnapshot(`
+            "X [ERROR] Unknown arguments: def, ghi
 
-            Unexpected additional positional arguments \\"def ghi\\"."
+            "
           `);
         });
 

package/src/__tests__/route.test.ts

@@ -0,0 +1,45 @@
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("wrangler route", () => {
+  mockConsoleMethods();
+  runInTempDir();
+
+  it("shows a deprecation notice when `wrangler route` is run", async () => {
+    await expect(runWrangler("route")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "Deprecation:
+            \`wrangler route\` has been deprecated.
+            Please use wrangler.toml and/or \`wrangler publish --routes\` to modify routes"
+          `);
+  });
+
+  it("shows a deprecation notice when `wrangler route delete` is run", async () => {
+    await expect(runWrangler("route delete")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "Deprecation:
+            \`wrangler route delete\` has been deprecated.
+            Remove the unwanted route(s) from wrangler.toml and run \`wrangler publish\` to remove your worker from those routes."
+          `);
+  });
+
+  it("shows a deprecation notice when `wrangler route delete <id>` is run", async () => {
+    await expect(runWrangler("route delete some-zone-id")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "Deprecation:
+            \`wrangler route delete\` has been deprecated.
+            Remove the unwanted route(s) from wrangler.toml and run \`wrangler publish\` to remove your worker from those routes."
+          `);
+  });
+
+  it("shows a deprecation notice when `wrangler route list` is run", async () => {
+    await expect(runWrangler("route list")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "Deprecation:
+            \`wrangler route list\` has been deprecated.
+            Refer to wrangler.toml for a list of routes the worker will be deployed to upon publishing.
+            Refer to the Cloudflare Dashboard to see the routes this worker is currently running on."
+          `);
+  });
+});

package/src/__tests__/secret.test.ts

@@ -1,18 +1,31 @@
+import * as fs from "node:fs";
+import * as TOML from "@iarna/toml";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { mockConfirm, mockPrompt } from "./helpers/mock-dialogs";
+import {
+  mockConfirm,
+  mockPrompt,
+  clearConfirmMocks,
+  clearPromptMocks,
+} from "./helpers/mock-dialogs";
+import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
+import { useMockStdin } from "./helpers/mock-stdin";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
 describe("wrangler secret", () => {
   const std = mockConsoleMethods();
+  const { mockGetMemberships } = mockOAuthFlow();
+
   runInTempDir();
   mockAccountId();
   mockApiToken();
 
   afterEach(() => {
     unsetAllMocks();
+    clearConfirmMocks();
+    clearPromptMocks();
   });
 
   describe("put", () => {
@@ -44,84 +57,222 @@ describe("wrangler secret", () => {
       );
     }
 
-    it("should create a secret", async () => {
-      mockPrompt({
-        text: "Enter a secret value:",
-        type: "password",
-        result: "the-secret",
+    describe("interactive", () => {
+      useMockStdin({ isTTY: true });
+
+      it("should trim stdin secret value", async () => {
+        mockPrompt({
+          text: "Enter a secret value:",
+          type: "password",
+          result: `hunter2
+          `,
+        });
+
+        mockPutRequest({ name: `secret-name`, text: `hunter2` });
+        await runWrangler("secret put secret-name --name script-name");
+        expect(std.out).toMatchInlineSnapshot(`
+          "🌀 Creating the secret for script script-name
+          ✨ Success! Uploaded secret secret-name"
+        `);
       });
 
-      mockPutRequest({ name: "the-secret-name", text: "the-secret" });
-      await runWrangler("secret put the-key --name script-name");
+      it("should create a secret", async () => {
+        mockPrompt({
+          text: "Enter a secret value:",
+          type: "password",
+          result: "the-secret",
+        });
 
-      expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Creating the secret for script script-name
-        ✨ Success! Uploaded secret the-key"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
+        mockPutRequest({ name: "the-key", text: "the-secret" });
+        await runWrangler("secret put the-key --name script-name");
 
-    it("should create a secret: legacy envs", async () => {
-      mockPrompt({
-        text: "Enter a secret value:",
-        type: "password",
-        result: "the-secret",
+        expect(std.out).toMatchInlineSnapshot(`
+                  "🌀 Creating the secret for script script-name
+                  ✨ Success! Uploaded secret the-key"
+              `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
-      mockPutRequest(
-        { name: "the-secret-name", text: "the-secret" },
-        "some-env",
-        true
-      );
-      await runWrangler(
-        "secret put the-key --name script-name --env some-env --legacy-env"
-      );
+      it("should create a secret: legacy envs", async () => {
+        mockPrompt({
+          text: "Enter a secret value:",
+          type: "password",
+          result: "the-secret",
+        });
 
-      expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Creating the secret for script script-name-some-env
-        ✨ Success! Uploaded secret the-key"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
+        mockPutRequest(
+          { name: "the-key", text: "the-secret" },
+          "some-env",
+          true
+        );
+        await runWrangler(
+          "secret put the-key --name script-name --env some-env --legacy-env"
+        );
 
-    it("should create a secret: service envs", async () => {
-      mockPrompt({
-        text: "Enter a secret value:",
-        type: "password",
-        result: "the-secret",
+        expect(std.out).toMatchInlineSnapshot(`
+                  "🌀 Creating the secret for script script-name-some-env
+                  ✨ Success! Uploaded secret the-key"
+              `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
-      mockPutRequest(
-        { name: "the-secret-name", text: "the-secret" },
-        "some-env",
-        false
-      );
-      await runWrangler(
-        "secret put the-key --name script-name --env some-env --legacy-env false"
-      );
+      it("should create a secret: service envs", async () => {
+        mockPrompt({
+          text: "Enter a secret value:",
+          type: "password",
+          result: "the-secret",
+        });
 
-      expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Creating the secret for script script-name (some-env)
-        ✨ Success! Uploaded secret the-key"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
+        mockPutRequest(
+          { name: "the-key", text: "the-secret" },
+          "some-env",
+          false
+        );
+        await runWrangler(
+          "secret put the-key --name script-name --env some-env --legacy-env false"
+        );
+
+        expect(std.out).toMatchInlineSnapshot(`
+                  "🌀 Creating the secret for script script-name (some-env)
+                  ✨ Success! Uploaded secret the-key"
+              `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error without a script name", async () => {
+        let error: Error | undefined;
+        try {
+          await runWrangler("secret put the-key");
+        } catch (e) {
+          error = e as Error;
+        }
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Missing script name
+
+          "
+        `);
+        expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
+      });
     });
 
-    it("should error without a script name", async () => {
-      let error: Error | undefined;
-      try {
-        await runWrangler("secret put the-key");
-      } catch (e) {
-        error = e as Error;
-      }
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`
-        "Missing script name
+    describe("non-interactive", () => {
+      const mockStdIn = useMockStdin({ isTTY: false });
 
-        %s
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
-      `);
-      expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
+      it("should trim stdin secret value, from piped input", async () => {
+        mockPutRequest({ name: "the-key", text: "the-secret" });
+        // Pipe the secret in as three chunks to test that we reconstitute it correctly.
+        mockStdIn.send(
+          `the`,
+          `-`,
+          `secret
+          ` // whitespace & newline being removed
+        );
+        await runWrangler("secret put the-key --name script-name");
+
+        expect(std.out).toMatchInlineSnapshot(`
+          "🌀 Creating the secret for script script-name
+          ✨ Success! Uploaded secret the-key"
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should create a secret, from piped input", async () => {
+        mockPutRequest({ name: "the-key", text: "the-secret" });
+        // Pipe the secret in as three chunks to test that we reconstitute it correctly.
+        mockStdIn.send("the", "-", "secret");
+        await runWrangler("secret put the-key --name script-name");
+
+        expect(std.out).toMatchInlineSnapshot(`
+          "🌀 Creating the secret for script script-name
+          ✨ Success! Uploaded secret the-key"
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error if the piped input fails", async () => {
+        mockPutRequest({ name: "the-key", text: "the-secret" });
+        mockStdIn.throwError(new Error("Error in stdin stream"));
+        await expect(
+          runWrangler("secret put the-key --name script-name")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(`"Error in stdin stream"`);
+
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      describe("with accountId", () => {
+        mockAccountId({ accountId: null });
+
+        it("should error if a user has no account", async () => {
+          mockGetMemberships({
+            success: false,
+            result: [],
+          });
+          await expect(
+            runWrangler("secret put the-key --name script-name")
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"Failed to automatically retrieve account IDs for the logged in user. In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your \`wrangler.toml\` file."`
+          );
+        });
+
+        it("should use the account from wrangler.toml", async () => {
+          fs.writeFileSync(
+            "wrangler.toml",
+            TOML.stringify({
+              account_id: "some-account-id",
+            }),
+            "utf-8"
+          );
+          mockStdIn.send("the-secret");
+          mockPutRequest({ name: "the-key", text: "the-secret" });
+          await runWrangler("secret put the-key --name script-name");
+          expect(std.out).toMatchInlineSnapshot(`
+            "🌀 Creating the secret for script script-name
+            ✨ Success! Uploaded secret the-key"
+          `);
+          expect(std.warn).toMatchInlineSnapshot(`""`);
+          expect(std.err).toMatchInlineSnapshot(`""`);
+        });
+
+        it("should error if a user has multiple accounts, and has not specified an account in wrangler.toml", async () => {
+          mockGetMemberships({
+            success: true,
+            result: [
+              {
+                id: "1",
+                account: { id: "account-id-1", name: "account-name-1" },
+              },
+              {
+                id: "2",
+                account: { id: "account-id-2", name: "account-name-2" },
+              },
+              {
+                id: "3",
+                account: { id: "account-id-3", name: "account-name-3" },
+              },
+            ],
+          });
+
+          await expect(runWrangler("secret put the-key --name script-name"))
+            .rejects.toThrowErrorMatchingInlineSnapshot(`
+                  "More than one account available but unable to select one in non-interactive mode.
+                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+                    \\"account-name-1\\" - \\"account-id-1\\")
+                    \\"account-name-2\\" - \\"account-id-2\\")
+                    \\"account-name-3\\" - \\"account-id-3\\")"
+                `);
+        });
+      });
     });
   });
 
@@ -219,12 +370,14 @@ describe("wrangler secret", () => {
       } catch (e) {
         error = e as Error;
       }
-      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/choose"
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Missing script name
+        "X [ERROR] Missing script name
 
-        %s
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
       `);
       expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
     });
@@ -313,12 +466,14 @@ describe("wrangler secret", () => {
       } catch (e) {
         error = e as Error;
       }
-      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/choose"
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Missing script name
+        "X [ERROR] Missing script name
 
-        %s
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
       `);
       expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
     });