wrangler 0.0.0-e88a54e → 0.0.0-e8a2a1d9

package/src/__tests__/r2.test.ts

@@ -1,198 +0,0 @@
-import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runInTempDir } from "./helpers/run-in-tmp";
-import { runWrangler } from "./helpers/run-wrangler";
-import type { R2BucketInfo } from "../r2";
-
-describe("wrangler", () => {
-  mockAccountId();
-  mockApiToken();
-  runInTempDir();
-  const std = mockConsoleMethods();
-
-  afterEach(() => {
-    unsetAllMocks();
-  });
-
-  describe("r2", () => {
-    describe("bucket", () => {
-      describe("list", () => {
-        function mockListRequest(buckets: R2BucketInfo[]) {
-          const requests = { count: 0 };
-          setMockResponse(
-            "/accounts/:accountId/r2/buckets",
-            ([_url, accountId], init) => {
-              requests.count++;
-              expect(accountId).toEqual("some-account-id");
-              expect(init).toEqual({});
-              return { buckets };
-            }
-          );
-          return requests;
-        }
-
-        it("should list buckets", async () => {
-          const expectedBuckets: R2BucketInfo[] = [
-            { name: "bucket-1", creation_date: "01-01-2001" },
-            { name: "bucket-2", creation_date: "01-01-2001" },
-          ];
-          mockListRequest(expectedBuckets);
-          await runWrangler("r2 bucket list");
-
-          expect(std.err).toMatchInlineSnapshot(`""`);
-          const buckets = JSON.parse(std.out);
-          expect(buckets).toEqual(expectedBuckets);
-        });
-      });
-
-      describe("create", () => {
-        function mockCreateRequest(expectedBucketName: string) {
-          const requests = { count: 0 };
-          setMockResponse(
-            "/accounts/:accountId/r2/buckets/:bucketName",
-            "PUT",
-            ([_url, accountId, bucketName]) => {
-              expect(accountId).toEqual("some-account-id");
-              expect(bucketName).toEqual(expectedBucketName);
-              requests.count += 1;
-            }
-          );
-          return requests;
-        }
-
-        it("should error if no bucket name is given", async () => {
-          await expect(
-            runWrangler("r2 bucket create")
-          ).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>
-
-            Create a new R2 bucket
-
-            Positionals:
-              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]
-
-            Not enough non-option arguments: got 0, need at least 1"
-          `);
-        });
-
-        it("should error if the bucket to create contains spaces", async () => {
-          await expect(
-            runWrangler("r2 bucket create abc def ghi")
-          ).rejects.toThrowErrorMatchingInlineSnapshot(
-            `"Unexpected additional positional arguments \\"def ghi\\"."`
-          );
-          expect(std.out).toMatchInlineSnapshot(`""`);
-          expect(std.err).toMatchInlineSnapshot(`
-            "wrangler r2 bucket create <name>
-
-            Create a new R2 bucket
-
-            Positionals:
-              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]
-
-            Unexpected additional positional arguments \\"def ghi\\"."
-          `);
-        });
-
-        it("should create a bucket", async () => {
-          const requests = mockCreateRequest("testBucket");
-          await runWrangler("r2 bucket create testBucket");
-          expect(std.out).toMatchInlineSnapshot(`
-            "Creating bucket testBucket.
-            Created bucket testBucket."
-          `);
-          expect(requests.count).toEqual(1);
-        });
-      });
-
-      describe("delete", () => {
-        function mockDeleteRequest(expectedBucketName: string) {
-          const requests = { count: 0 };
-          setMockResponse(
-            "/accounts/:accountId/r2/buckets/:bucketName",
-            "DELETE",
-            ([_url, accountId, bucketName]) => {
-              expect(accountId).toEqual("some-account-id");
-              expect(bucketName).toEqual(expectedBucketName);
-              requests.count += 1;
-            }
-          );
-          return requests;
-        }
-
-        it("should error if no bucket name is given", async () => {
-          await expect(
-            runWrangler("r2 bucket delete")
-          ).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>
-
-            Delete an R2 bucket
-
-            Positionals:
-              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]
-
-            Not enough non-option arguments: got 0, need at least 1"
-          `);
-        });
-
-        it("should error if the bucket name to delete contains spaces", async () => {
-          await expect(
-            runWrangler("r2 bucket delete abc def ghi")
-          ).rejects.toThrowErrorMatchingInlineSnapshot(
-            `"Unexpected additional positional arguments \\"def ghi\\"."`
-          );
-          expect(std.out).toMatchInlineSnapshot(`""`);
-          expect(std.err).toMatchInlineSnapshot(`
-            "wrangler r2 bucket delete <name>
-
-            Delete an R2 bucket
-
-            Positionals:
-              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]
-
-            Unexpected additional positional arguments \\"def ghi\\"."
-          `);
-        });
-
-        it("should delete a bucket specified by name", async () => {
-          const requests = mockDeleteRequest("some-bucket");
-          await runWrangler(`r2 bucket delete some-bucket`);
-          expect(requests.count).toEqual(1);
-        });
-      });
-    });
-  });
-});

package/src/__tests__/route.test.ts

@@ -1,45 +0,0 @@
-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 WARNING:
-            \`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 WARNING:
-            \`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 WARNING:
-            \`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 WARNING:
-            \`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,425 +0,0 @@
-import * as fs from "node:fs";
-import * as TOML from "@iarna/toml";
-import fetchMock from "jest-fetch-mock";
-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 { useMockStdin } from "./helpers/mock-stdin";
-import { runInTempDir } from "./helpers/run-in-tmp";
-import { runWrangler } from "./helpers/run-wrangler";
-
-describe("wrangler secret", () => {
-  const std = mockConsoleMethods();
-  runInTempDir();
-  mockAccountId();
-  mockApiToken();
-
-  afterEach(() => {
-    unsetAllMocks();
-  });
-
-  describe("put", () => {
-    function mockPutRequest(
-      input: { name: string; text: string },
-      env?: string,
-      legacyEnv = false
-    ) {
-      const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
-      const environment = env && !legacyEnv ? "/environments/:envName" : "";
-      setMockResponse(
-        `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
-        "PUT",
-        ([_url, accountId, scriptName, envName], { body }) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(scriptName).toEqual(
-            legacyEnv && env ? `script-name-${env}` : "script-name"
-          );
-          if (!legacyEnv) {
-            expect(envName).toEqual(env);
-          }
-          const { name, text, type } = JSON.parse(body as string);
-          expect(type).toEqual("secret_text");
-          expect(name).toEqual(input.name);
-          expect(text).toEqual(input.text);
-
-          return { name, type };
-        }
-      );
-    }
-
-    describe("interactive", () => {
-      useMockStdin({ isTTY: true });
-
-      it("should create a secret", async () => {
-        mockPrompt({
-          text: "Enter a secret value:",
-          type: "password",
-          result: "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.err).toMatchInlineSnapshot(`""`);
-      });
-
-      it("should create a secret: legacy envs", async () => {
-        mockPrompt({
-          text: "Enter a secret value:",
-          type: "password",
-          result: "the-secret",
-        });
-
-        mockPutRequest(
-          { name: "the-key", text: "the-secret" },
-          "some-env",
-          true
-        );
-        await runWrangler(
-          "secret put the-key --name script-name --env some-env --legacy-env"
-        );
-
-        expect(std.out).toMatchInlineSnapshot(`
-                  "🌀 Creating the secret for script script-name-some-env
-                  ✨ Success! Uploaded secret the-key"
-              `);
-        expect(std.err).toMatchInlineSnapshot(`""`);
-      });
-
-      it("should create a secret: service envs", async () => {
-        mockPrompt({
-          text: "Enter a secret value:",
-          type: "password",
-          result: "the-secret",
-        });
-
-        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(`""`);
-        expect(std.err).toMatchInlineSnapshot(`
-          "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]`);
-      });
-    });
-
-    describe("non-interactive", () => {
-      const mockStdIn = useMockStdin({ isTTY: false });
-
-      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(`""`);
-        expect(std.warn).toMatchInlineSnapshot(`""`);
-      });
-
-      describe("with accountId", () => {
-        mockAccountId({ accountId: null });
-
-        it("should error if a user has no account", async () => {
-          await expect(
-            runWrangler("secret put the-key --name script-name")
-          ).rejects.toThrowErrorMatchingInlineSnapshot(
-            `"No account id found, quitting..."`
-          );
-        });
-
-        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 () => {
-          // This is a mock response for the request to the CF API memberships of the current user.
-          fetchMock.doMockOnce(async () => {
-            return {
-              body: JSON.stringify({
-                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\\")"
-                `);
-        });
-      });
-    });
-  });
-
-  describe("delete", () => {
-    function mockDeleteRequest(
-      input: {
-        scriptName: string;
-        secretName: string;
-      },
-      env?: string,
-      legacyEnv = false
-    ) {
-      const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
-      const environment = env && !legacyEnv ? "/environments/:envName" : "";
-      setMockResponse(
-        `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
-        "DELETE",
-        ([_url, accountId, scriptName, envOrSecretName, secretName]) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(scriptName).toEqual(
-            legacyEnv && env ? `script-name-${env}` : "script-name"
-          );
-          if (!legacyEnv) {
-            if (env) {
-              expect(envOrSecretName).toEqual(env);
-              expect(secretName).toEqual(input.secretName);
-            } else {
-              expect(envOrSecretName).toEqual(input.secretName);
-            }
-          } else {
-            expect(envOrSecretName).toEqual(input.secretName);
-          }
-          return null;
-        }
-      );
-    }
-    it("should delete a secret", async () => {
-      mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
-      mockConfirm({
-        text: "Are you sure you want to permanently delete the variable the-key on the script script-name?",
-        result: true,
-      });
-      await runWrangler("secret delete the-key --name script-name");
-      expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name
-        ✨ Success! Deleted secret the-key"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
-
-    it("should delete a secret: legacy envs", async () => {
-      mockDeleteRequest(
-        { scriptName: "script-name", secretName: "the-key" },
-        "some-env",
-        true
-      );
-      mockConfirm({
-        text: "Are you sure you want to permanently delete the variable the-key on the script script-name-some-env?",
-        result: true,
-      });
-      await runWrangler(
-        "secret delete the-key --name script-name --env some-env --legacy-env"
-      );
-      expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name-some-env
-        ✨ Success! Deleted secret the-key"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
-
-    it("should delete a secret: service envs", async () => {
-      mockDeleteRequest(
-        { scriptName: "script-name", secretName: "the-key" },
-        "some-env"
-      );
-      mockConfirm({
-        text: "Are you sure you want to permanently delete the variable the-key on the script script-name (some-env)?",
-        result: true,
-      });
-      await runWrangler(
-        "secret delete the-key --name script-name --env some-env --legacy-env false"
-      );
-      expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name (some-env)
-        ✨ Success! Deleted secret the-key"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
-
-    it("should error without a script name", async () => {
-      let error: Error | undefined;
-
-      try {
-        await runWrangler("secret delete the-key");
-      } catch (e) {
-        error = e as Error;
-      }
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`
-        "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]`);
-    });
-  });
-
-  describe("list", () => {
-    function mockListRequest(
-      input: { scriptName: string },
-      env?: string,
-      legacyEnv = false
-    ) {
-      const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
-      const environment = env && !legacyEnv ? "/environments/:envName" : "";
-      setMockResponse(
-        `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
-        "GET",
-        ([_url, accountId, scriptName, envName]) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(scriptName).toEqual(
-            legacyEnv && env ? `script-name-${env}` : "script-name"
-          );
-          if (!legacyEnv) {
-            expect(envName).toEqual(env);
-          }
-
-          return [
-            {
-              name: "the-secret-name",
-              type: "secret_text",
-            },
-          ];
-        }
-      );
-    }
-
-    it("should list secrets", async () => {
-      mockListRequest({ scriptName: "script-name" });
-      await runWrangler("secret list --name script-name");
-      expect(std.out).toMatchInlineSnapshot(`
-        "[
-          {
-            \\"name\\": \\"the-secret-name\\",
-            \\"type\\": \\"secret_text\\"
-          }
-        ]"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
-
-    it("should list secrets: legacy envs", async () => {
-      mockListRequest({ scriptName: "script-name" }, "some-env", true);
-      await runWrangler(
-        "secret list --name script-name --env some-env --legacy-env"
-      );
-      expect(std.out).toMatchInlineSnapshot(`
-        "[
-          {
-            \\"name\\": \\"the-secret-name\\",
-            \\"type\\": \\"secret_text\\"
-          }
-        ]"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
-
-    it("should list secrets: service envs", async () => {
-      mockListRequest({ scriptName: "script-name" }, "some-env");
-      await runWrangler(
-        "secret list --name script-name --env some-env --legacy-env false"
-      );
-      expect(std.out).toMatchInlineSnapshot(`
-        "[
-          {
-            \\"name\\": \\"the-secret-name\\",
-            \\"type\\": \\"secret_text\\"
-          }
-        ]"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-    });
-
-    it("should error without a script name", async () => {
-      let error: Error | undefined;
-      try {
-        await runWrangler("secret list");
-      } catch (e) {
-        error = e as Error;
-      }
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`
-        "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]`);
-    });
-  });
-});