wrangler 0.0.0-e2a26a0 → 0.0.0-e2b7352

package/src/__tests__/secret.test.ts

@@ -1,7 +1,11 @@
+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";
 
@@ -16,12 +20,24 @@ describe("wrangler secret", () => {
   });
 
   describe("put", () => {
-    function mockPutRequest(input: { name: string; text: string }) {
+    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/scripts/:scriptName/secrets",
+        `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
         "PUT",
-        ([_url, accountId], { body }) => {
+        ([_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);
@@ -32,70 +48,213 @@ 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 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(`""`);
       });
 
-      mockPutRequest({ name: "the-secret-name", 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-key", text: "the-secret" },
+          "some-env",
+          true
+        );
+        await runWrangler(
+          "secret put the-key --name script-name --env some-env --legacy-env"
+        );
 
-    it("should error without a script name", async () => {
-      let error: Error | undefined;
-      try {
-        await runWrangler("secret put the-key");
-      } catch (e) {
-        error = e;
-      }
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`
-        "Missing script name
+        expect(std.out).toMatchInlineSnapshot(`
+                  "🌀 Creating the secret for script script-name-some-env
+                  ✨ Success! Uploaded secret the-key"
+              `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
 
-        %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 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]`);
+      });
     });
 
-    it("warns about being a no-op in local mode", async () => {
-      mockPrompt({
-        text: "Enter a secret value:",
-        type: "password",
-        result: "the-secret",
+    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(`""`);
       });
 
-      mockPutRequest({ name: "the-secret-name", text: "the-secret" });
-      await runWrangler("secret put the-key --name script-name --local");
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(
-        `"\`wrangler secret put\` is a no-op in --local mode"`
-      );
+      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;
-    }) {
+    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/scripts/:scriptName/secrets/:secretName",
+        `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
         "DELETE",
-        ([_url, accountId, scriptName, secretName]) => {
+        ([_url, accountId, scriptName, envOrSecretName, secretName]) => {
           expect(accountId).toEqual("some-account-id");
-          expect(scriptName).toEqual(input.scriptName);
-          expect(secretName).toEqual(input.secretName);
-
+          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;
         }
       );
@@ -108,7 +267,46 @@ describe("wrangler secret", () => {
       });
       await runWrangler("secret delete the-key --name script-name");
       expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name.
+        "🌀 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(`""`);
@@ -120,42 +318,37 @@ describe("wrangler secret", () => {
       try {
         await runWrangler("secret delete the-key");
       } catch (e) {
-        error = 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."
+        %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("warns about being a no-op in local mode", async () => {
-      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 --local");
-      expect(std.out).toMatchInlineSnapshot(
-        `"🌀 Deleting the secret the-key on script script-name."`
-      );
-      expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(
-        `"\`wrangler secret delete\` is a no-op in --local mode"`
-      );
-    });
   });
 
   describe("list", () => {
-    function mockListRequest(input: { scriptName: string }) {
+    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/scripts/:scriptName/secrets",
+        `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
         "GET",
-        ([_url, accountId, scriptName]) => {
+        ([_url, accountId, scriptName, envName]) => {
           expect(accountId).toEqual("some-account-id");
-          expect(scriptName).toEqual(input.scriptName);
+          expect(scriptName).toEqual(
+            legacyEnv && env ? `script-name-${env}` : "script-name"
+          );
+          if (!legacyEnv) {
+            expect(envName).toEqual(env);
+          }
 
           return [
             {
@@ -181,30 +374,52 @@ describe("wrangler secret", () => {
       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;
+        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."
+        %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("warns about being a no-op in local mode", async () => {
-      await runWrangler("secret list --name script-name --local");
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(
-        `"\`wrangler secret list\` is a no-op in --local mode"`
-      );
-    });
   });
 });

package/src/__tests__/sentry.test.ts

@@ -0,0 +1,146 @@
+import * as fs from "node:fs";
+import * as fsp from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import * as TOML from "@iarna/toml";
+import * as Sentry from "@sentry/node";
+import prompts from "prompts";
+
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+const { reportError } = jest.requireActual("../reporting");
+
+describe("Error Reporting", () => {
+  runInTempDir({ homedir: "./home" });
+  mockConsoleMethods();
+  const reportingTOMLPath = ".wrangler/config/reporting.toml";
+
+  const originalTTY = process.stdout.isTTY;
+  beforeEach(() => {
+    jest.mock("@sentry/node");
+    jest.spyOn(Sentry, "captureException");
+    process.stdout.isTTY = true;
+  });
+
+  afterEach(() => {
+    jest.unmock("@sentry/node");
+    jest.clearAllMocks();
+    process.stdout.isTTY = originalTTY;
+  });
+
+  it("should confirm user will allow error reporting usage", async () => {
+    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: true });
+
+    await reportError(new Error("test error"), "testFalse");
+
+    const { error_tracking_opt, error_tracking_opt_date } = TOML.parse(
+      await fsp.readFile(path.join(os.homedir(), reportingTOMLPath), "utf-8")
+    );
+
+    expect(error_tracking_opt).toBe(true);
+    expect(error_tracking_opt_date).toBeTruthy();
+
+    expect(Sentry.captureException).toHaveBeenCalledWith(
+      new Error("test error")
+    );
+  });
+
+  it("should confirm user will disallow error reporting usage", async () => {
+    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: false });
+    await reportError(new Error("test error"), "testFalse");
+
+    const { error_tracking_opt, error_tracking_opt_date } = TOML.parse(
+      await fsp.readFile(path.join(os.homedir(), reportingTOMLPath), "utf-8")
+    );
+
+    expect(error_tracking_opt).toBe(false);
+    expect(error_tracking_opt_date).toBeTruthy();
+
+    expect(Sentry.captureException).not.toHaveBeenCalledWith(
+      new Error("test error"),
+      "testFalse"
+    );
+  });
+
+  it("should confirm user will allow 'once' error reporting usage", async () => {
+    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: "once" });
+    await runWrangler();
+    await reportError(new Error("test error"), "testFalse");
+
+    expect(fs.existsSync(path.join(os.homedir(), reportingTOMLPath))).toBe(
+      false
+    );
+
+    expect(Sentry.captureException).not.toHaveBeenCalledWith(
+      new Error("test error"),
+      "testFalse"
+    );
+  });
+
+  it("should not prompt w/ subsequent Errors after user disallows error reporting", async () => {
+    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: false });
+    await reportError(new Error("test error"), "testFalse");
+
+    expect(Sentry.captureException).not.toHaveBeenCalledWith(
+      new Error("test error"),
+      "testFalse"
+    );
+
+    await reportError(new Error("second test error"), "testFalse");
+    expect(Sentry.captureException).not.toHaveBeenCalledWith(
+      new Error("second test error"),
+      "testFalse"
+    );
+  });
+
+  it("should not prompt w/ subsequent Errors after user Always allows error reporting", async () => {
+    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: true });
+    await reportError(new Error("test error"), "testFalse");
+
+    expect(Sentry.captureException).toHaveBeenCalledWith(
+      new Error("test error")
+    );
+
+    await reportError(new Error("second test error"), "testFalse");
+    expect(Sentry.captureException).toHaveBeenCalledWith(
+      new Error("second test error")
+    );
+  });
+
+  it("should prompt w/ subsequent Errors after user allows error reporting once", async () => {
+    const promptSpy = jest
+      .spyOn(prompts, "prompt")
+      .mockResolvedValue({ sentryDecision: "once" });
+    await reportError(new Error("test error"), "testFalse");
+
+    expect(Sentry.captureException).toHaveBeenCalledWith(
+      new Error("test error")
+    );
+
+    await reportError(new Error("second test error"), "testFalse");
+    expect(Sentry.captureException).toHaveBeenCalledWith(
+      new Error("second test error")
+    );
+
+    expect(promptSpy).toBeCalledTimes(2);
+  });
+
+  it("should not prompt in non-TTY environment", async () => {
+    process.stdout.isTTY = false;
+
+    await reportError(new Error("test error"), "testFalse");
+
+    const { error_tracking_opt, error_tracking_opt_date } = TOML.parse(
+      await fsp.readFile(path.join(os.homedir(), reportingTOMLPath), "utf-8")
+    );
+
+    expect(error_tracking_opt).toBe(false);
+    expect(error_tracking_opt_date).toBeTruthy();
+
+    expect(Sentry.captureException).not.toHaveBeenCalledWith(
+      new Error("test error")
+    );
+    process.stdout.isTTY = originalTTY;
+  });
+});