removes unnecessary wrangler tail warning against resetting durable o…

…bject (#6160) * removes unnecessary wrangler tail warning against resetting durable object * removes commented out code
cloudflare · Jun 27, 2024 · 9466531 · 9466531
1 parent 61fbf8a
commit 9466531
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 43 deletions.
diff --git a/.changeset/tender-boxes-confess.md b/.changeset/tender-boxes-confess.md
@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+fix: removes unnecessary wrangler tail warning against resetting durable object
+
+fixes https://jira.cfdata.org/browse/STOR-3318
diff --git a/packages/wrangler/src/__tests__/tail.test.ts b/packages/wrangler/src/__tests__/tail.test.ts
@@ -4,7 +4,7 @@ import { vi } from "vitest";
 import MockWebSocketServer from "vitest-websocket-mock";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { clearDialogs, mockConfirm } from "./helpers/mock-dialogs";
+import { clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { MockWebSocket } from "./helpers/mock-web-socket";
 import { createFetchResult, msw, mswSucessScriptHandlers } from "./helpers/msw";
@@ -69,31 +69,14 @@ describe("tail", () => {
 	 * deletion, and connection.
 	 */
 	describe("API interaction", () => {
-		const { setIsTTY } = useMockIsTTY();
 		it("should throw an error if name isn't provided", async () => {
 			await expect(
 				runWrangler("tail")
 			).rejects.toThrowErrorMatchingInlineSnapshot(
 				`[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`wrangler tail <worker-name>\`]`
 			);
 		});
-		it("warns about durable object restarts for tty", async () => {
-			setIsTTY(true);
-			mockConfirm({
-				text: "Would you like to continue?",
-				result: false,
-			});
-			api = mockWebsocketAPIs();
-			expect(api.requests.creation.length).toStrictEqual(0);
-			await runWrangler("tail durable-object--websocket--response");
-			expect(std.out).toMatchInlineSnapshot(`""`);
-			expect(std.warn).toMatchInlineSnapshot(`
-			"[33m▲ [43;33m[[43;30mWARNING[43;33m][0m [1mBeginning log collection requires restarting the Durable Objects associated with durable-object--websocket--response. Any WebSocket connections or other non-persisted state will be lost as part of this restart.[0m
 
-			"
-		`);
-			expect(std.err).toMatchInlineSnapshot(`""`);
-		});
 		it("creates and then delete tails", async () => {
 			api = mockWebsocketAPIs();
 			expect(api.requests.creation.length).toStrictEqual(0);

diff --git a/packages/wrangler/src/tail/index.ts b/packages/wrangler/src/tail/index.ts
@@ -1,8 +1,6 @@
 import { setTimeout } from "node:timers/promises";
 import onExit from "signal-exit";
-import { fetchResult, fetchScriptContent } from "../cfetch";
 import { readConfig } from "../config";
-import { confirm } from "../dialogs";
 import { createFatalError, UserError } from "../errors";
 import {
 	getLegacyScriptName,
@@ -19,7 +17,6 @@ import {
 	prettyPrintLogs,
 	translateCLICommandToFilterMessage,
 } from "./createTail";
-import type { WorkerMetadata } from "../deployment-bundle/create-worker-upload-form";
 import type {
 	CommonYargsArgv,
 	StrictYargsOptionsToInterface,
@@ -129,29 +126,7 @@ export async function tailHandler(args: TailArgs) {
 		clientIp: args.ip,
 		versionId: args.versionId,
 	};
-	const scriptContent: string = await fetchScriptContent(
-		(!isLegacyEnv(config) ? args.env : undefined)
-			? `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/content`
-			: `/accounts/${accountId}/workers/scripts/${scriptName}`
-	);
-
-	const bindings = await fetchResult<WorkerMetadata["bindings"]>(
-		(!isLegacyEnv(config) ? args.env : undefined)
-			? `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/bindings`
-			: `/accounts/${accountId}/workers/scripts/${scriptName}/bindings`
-	);
-	if (
-		scriptContent.toLowerCase().includes("websocket") &&
-		bindings.find((b) => b.type === "durable_object_namespace")
-	) {
-		logger.warn(
-			`Beginning log collection requires restarting the Durable Objects associated with ${scriptName}. Any WebSocket connections or other non-persisted state will be lost as part of this restart.`
-		);
 
-		if (!(await confirm("Would you like to continue?"))) {
-			return;
-		}
-	}
 	const filters = translateCLICommandToFilterMessage(cliFilters);
 
 	const { tail, expiration, deleteTail } = await createTail(