fixup tests and devin comments

Author: emily-shen

packages/wrangler/src/__tests__/artifacts.test.ts

@@ -1,3 +1,4 @@
+import { runInTempDir } from "@cloudflare/workers-utils/test-helpers";
 import { http, HttpResponse } from "msw";
 import { afterEach, beforeEach, describe, it, vi } from "vitest";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
@@ -34,7 +35,7 @@ describe("artifacts", () => {
 		clearDialogs();
 		msw.resetHandlers();
 	});
-
+	runInTempDir();
 	describe("namespaces", () => {
 		it("should show help for namespace commands", async ({ expect }) => {
 			await runWrangler("artifacts namespaces --help");

packages/wrangler/src/__tests__/banner.test.ts

@@ -16,8 +16,7 @@ describe("wrangler banner", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 			"
 			 ⛅️ wrangler x.x.x
-			──────────────────
-			Using profile: testing"
+			──────────────────"
 		`);
 	});
 
@@ -39,8 +38,7 @@ describe("wrangler banner", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 			"
 			 ⛅️ wrangler x.x.x
-			──────────────────
-			Using profile: testing"
+			──────────────────"
 		`);
 	});
 });

packages/wrangler/src/__tests__/containers/registries.test.ts

@@ -1,4 +1,5 @@
 import { http, HttpResponse } from "msw";
+import { runInTempDir } from "@cloudflare/workers-utils/test-helpers";
 import { afterEach, beforeEach, describe, it, vi } from "vitest";
 import { mockAccount } from "../cloudchamber/utils";
 import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
@@ -19,6 +20,7 @@ import { runWrangler } from "../helpers/run-wrangler";
 import type { ExpectStatic } from "vitest";
 
 describe("containers registries --help", () => {
+	runInTempDir();
 	const std = mockConsoleMethods();
 
 	it("should help", async ({ expect }) => {
@@ -46,6 +48,7 @@ describe("containers registries --help", () => {
 });
 
 describe("containers registries configure", () => {
+	runInTempDir();
 	const std = mockConsoleMethods();
 	const { setIsTTY } = useMockIsTTY();
 	const cliStd = mockCLIOutput();
@@ -569,6 +572,7 @@ describe("containers registries configure", () => {
 });
 
 describe("containers registries list", () => {
+	runInTempDir();
 	const std = mockConsoleMethods();
 	const cliStd = mockCLIOutput();
 	mockAccountId();
@@ -601,8 +605,7 @@ describe("containers registries list", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 			"
 			 ⛅️ wrangler x.x.x
-			──────────────────
-			Using profile: testing"
+			──────────────────"
 		`);
 		expect(cliStd.stdout).toMatchInlineSnapshot(`
 			"╭ List configured container registries
@@ -636,6 +639,7 @@ describe("containers registries list", () => {
 });
 
 describe("containers registries delete", () => {
+	runInTempDir();
 	const cliStd = mockCLIOutput();
 	const std = mockConsoleMethods();
 	const { setIsTTY } = useMockIsTTY();
@@ -698,7 +702,6 @@ describe("containers registries delete", () => {
 			"
 			 ⛅️ wrangler x.x.x
 			──────────────────
-			Using profile: testing
 			? Are you sure you want to delete the registry credentials for 123456789012.dkr.ecr.us-west-2.amazonaws.com? This action cannot be undone.
 			🤖 Using fallback value in non-interactive context: yes"
 		`);
@@ -837,6 +840,7 @@ describe("containers registries delete", () => {
 });
 
 describe("containers registries credentials", () => {
+	runInTempDir();
 	const { setIsTTY } = useMockIsTTY();
 	const std = mockConsoleMethods();
 	mockAccountId();

packages/wrangler/src/__tests__/profile.test.ts

@@ -20,7 +20,11 @@ import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
-import { msw, mswSuccessOauthHandlers } from "./helpers/msw";
+import {
+	msw,
+	mswSuccessOauthHandlers,
+	mswSuccessUserHandlers,
+} from "./helpers/msw";
 import { runWrangler } from "./helpers/run-wrangler";
 
 describe("Profile", () => {
@@ -451,6 +455,65 @@ describe("Profile", () => {
 			});
 		});
 
+		describe("active profile in banner", () => {
+			beforeEach(() => {
+				msw.use(...mswSuccessUserHandlers);
+			});
+
+			it("should print the active profile under the banner", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile(
+					{
+						oauth_token: "token",
+						refresh_token: "refresh",
+						expiration_time: "2030-01-01T00:00:00Z",
+					},
+					"work"
+				);
+				setActiveProfile("work");
+
+				await runWrangler("whoami");
+
+				expect(std.out).toContain("Using profile: work");
+			});
+
+			it("should not print the active profile with --json", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile(
+					{
+						oauth_token: "token",
+						refresh_token: "refresh",
+						expiration_time: "2030-01-01T00:00:00Z",
+					},
+					"work"
+				);
+				setActiveProfile("work");
+
+				await runWrangler("whoami --json");
+
+				expect(std.out).not.toContain("Using profile");
+				const output = JSON.parse(std.out);
+				expect(output.loggedIn).toBe(true);
+				expect(output.profile).toBe("work");
+			});
+
+			it("should not print profile line when using default profile", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile({
+					oauth_token: "token",
+					refresh_token: "refresh",
+					expiration_time: "2030-01-01T00:00:00Z",
+				});
+
+				await runWrangler("whoami");
+
+				expect(std.out).not.toContain("Using profile");
+			});
+		});
+
 		describe("wrangler profiles unset", () => {
 			it("should reset the active profile to default", async ({ expect }) => {
 				writeAuthConfigFile(

packages/wrangler/src/__tests__/user.test.ts

@@ -301,9 +301,9 @@ describe("User", () => {
 			await runWrangler("login");
 
 			expect(std.err).toMatchInlineSnapshot(`
-				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mYou are currently using the auth profile "work[0m
+				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mYou are currently using the auth profile "work".[0m
 
-				  ". If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
+				   If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
 				   If you want to switch to an existing auth profile, run \`wrangler profiles set <profile name>\`.
 
 
@@ -321,9 +321,9 @@ describe("User", () => {
 			await runWrangler("login");
 
 			expect(std.err).toMatchInlineSnapshot(`
-				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mThis directory is bound to the auth profile "work[0m
+				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mThis directory is bound to the auth profile "work"[0m
 
-				  " If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
+				   If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
 				   If you want to switch to an existing auth profile, run \`wrangler profiles set <profile name>\`.
 
 

packages/wrangler/src/__tests__/vpc.test.ts

@@ -865,6 +865,7 @@ describe("extractPortFromHostname", () => {
 });
 
 describe("hostname validation", () => {
+	runInTempDir();
 	it("should accept valid hostnames", ({ expect }) => {
 		expect(() => validateHostname("api.example.com")).not.toThrow();
 		expect(() => validateHostname("localhost")).not.toThrow();

packages/wrangler/src/core/register-yargs-command.ts

@@ -147,7 +147,7 @@ function createHandler(def: InternalCommandDefinition, argv: string[]) {
 				typeof shouldPrintBanner !== "function" || bannerEnabled;
 
 			if (!getWranglerHideBanner()) {
-				if ((def.behaviour?.printActiveProfile ?? true) && shouldPrintBanner) {
+				if ((def.behaviour?.printActiveProfile ?? true) && bannerEnabled) {
 					const activeProfile = getActiveProfileName();
 					if (activeProfile !== "default") {
 						logger.log(`Using profile: ${chalk.blue(activeProfile)}`);

packages/wrangler/src/user/commands.ts

@@ -1,16 +1,15 @@
-import { CommandLineArgsError, UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils";
 import { readConfig } from "../config";
 import { createCommand, createNamespace } from "../core/create-command";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
+import { handleScopesArgs, loginArgs } from "./login-shared";
 import { getActiveProfileName, getProfileForDirectory } from "./profiles";
 import {
 	getAuthFromEnv,
 	getOAuthTokenFromLocalState,
-	listScopes,
 	login,
 	logout,
-	validateScopeKeys,
 	type Scope,
 } from "./user";
 import { whoami } from "./whoami";
@@ -23,63 +22,6 @@ export type AuthTokenInfo =
 	| { type: "api_token"; token: string }
 	| { type: "api_key"; key: string; email: string };
 
-export const loginArgs = {
-	browser: {
-		default: true,
-		type: "boolean",
-		describe: "Automatically open the OAuth link in a browser",
-	},
-	scopes: {
-		describe: "Pick the set of applicable OAuth scopes when logging in",
-		array: true,
-		type: "string",
-		requiresArg: true,
-	},
-	"scopes-list": {
-		describe: "List all the available OAuth scopes with descriptions",
-	},
-	"callback-host": {
-		describe:
-			"Use the ip or host address for the temporary login callback server.",
-		type: "string",
-		requiresArg: false,
-		default: "localhost",
-	},
-	"callback-port": {
-		describe: "Use the port for the temporary login callback server.",
-		type: "number",
-		requiresArg: false,
-		default: 8976,
-	},
-} as const;
-
-/**
- * Handle `--scopes-list` and `--scopes` validation.
- * Returns `true` when the caller should return early (scopes were listed or empty).
- */
-export function handleScopesArgs(args: {
-	scopesList?: unknown;
-	scopes?: string[];
-}): boolean {
-	if (args.scopesList) {
-		listScopes();
-		return true;
-	}
-	if (args.scopes) {
-		if (args.scopes.length === 0) {
-			listScopes();
-			return true;
-		}
-		if (!validateScopeKeys(args.scopes)) {
-			throw new CommandLineArgsError(
-				`One of ${args.scopes} is not a valid authentication scope. Run "wrangler login --scopes-list" to see the valid scopes.`,
-				{ telemetryMessage: "user login invalid scope" }
-			);
-		}
-	}
-	return false;
-}
-
 export const loginCommand = createCommand({
 	metadata: {
 		description: "🔓 Login to Cloudflare",
@@ -102,8 +44,8 @@ export const loginCommand = createCommand({
 		const currentProfile = getActiveProfileName();
 		if (currentProfile !== "default") {
 			const message = getProfileForDirectory()
-				? `This directory is bound to the auth profile "${currentProfile}\n"`
-				: `You are currently using the auth profile "${currentProfile}\n".`;
+				? `This directory is bound to the auth profile "${currentProfile}"\n`
+				: `You are currently using the auth profile "${currentProfile}".\n`;
 			logger.error(
 				message,
 				"If you want to create a new auth profile, run `wrangler profiles create <profile name>`.\n",

packages/wrangler/src/user/login-shared.ts

@@ -0,0 +1,59 @@
+import { CommandLineArgsError } from "@cloudflare/workers-utils";
+import { listScopes, validateScopeKeys } from "./user";
+
+export const loginArgs = {
+	browser: {
+		default: true,
+		type: "boolean",
+		describe: "Automatically open the OAuth link in a browser",
+	},
+	scopes: {
+		describe: "Pick the set of applicable OAuth scopes when logging in",
+		array: true,
+		type: "string",
+		requiresArg: true,
+	},
+	"scopes-list": {
+		describe: "List all the available OAuth scopes with descriptions",
+	},
+	"callback-host": {
+		describe:
+			"Use the ip or host address for the temporary login callback server.",
+		type: "string",
+		requiresArg: false,
+		default: "localhost",
+	},
+	"callback-port": {
+		describe: "Use the port for the temporary login callback server.",
+		type: "number",
+		requiresArg: false,
+		default: 8976,
+	},
+} as const;
+
+/**
+ * Handle `--scopes-list` and `--scopes` validation.
+ * Returns `true` when the caller should return early (scopes were listed or empty).
+ */
+export function handleScopesArgs(args: {
+	scopesList?: unknown;
+	scopes?: string[];
+}): boolean {
+	if (args.scopesList) {
+		listScopes();
+		return true;
+	}
+	if (args.scopes) {
+		if (args.scopes.length === 0) {
+			listScopes();
+			return true;
+		}
+		if (!validateScopeKeys(args.scopes)) {
+			throw new CommandLineArgsError(
+				`One of ${args.scopes} is not a valid authentication scope. Run "wrangler login --scopes-list" to see the valid scopes.`,
+				{ telemetryMessage: "user login invalid scope" }
+			);
+		}
+	}
+	return false;
+}

packages/wrangler/src/user/profiles.ts

@@ -17,7 +17,7 @@ import { createCommand, createNamespace } from "../core/create-command";
 import { confirm } from "../dialogs";
 import { logger } from "../logger";
 import { getWranglerProfileFromEnv } from "./auth-variables";
-import { handleScopesArgs, loginArgs } from "./commands";
+import { handleScopesArgs, loginArgs } from "./login-shared";
 import {
 	getAuthConfigFilePath,
 	login,
@@ -492,8 +492,14 @@ export const profileDeleteCommand = createCommand({
 		}
 	},
 	async handler(args) {
-		const token = readAuthConfigFile(args.name).oauth_token;
-		await revokeToken(token);
+		const token = readAuthConfigFile(args.name).refresh_token;
+		if (token) {
+			await revokeToken(token);
+		} else {
+			logger.warn(
+				`No refresh token found for profile "${args.name}". The token could not be revoked and may still be valid.`
+			);
+		}
 		deleteProfile(args.name);
 		logger.log(`✅ Deleted profile "${args.name}".\n`);
 	},