Ignore cached account id when CLOUDFLARE_ACCOUNT_ID is specified (#…

…3912)
cloudflare · Sep 11, 2023 · 0ba5884 · 0ba5884
1 parent a986f19
commit 0ba5884
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/stupid-islands-relax.md b/.changeset/stupid-islands-relax.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Ignore cached account id when `CLOUDFLARE_ACCOUNT_ID` is specified
diff --git a/packages/wrangler/src/user/user.ts b/packages/wrangler/src/user/user.ts
@@ -234,6 +234,7 @@ import {
 	getCloudflareAccessToken,
 	getCloudflareAPITokenFromEnv,
 	getCloudflareGlobalAuthEmailFromEnv,
+	getCloudflareAccountIdFromEnv,
 	getCloudflareGlobalAuthKeyFromEnv,
 	getRevokeUrlFromEnv,
 	getTokenUrlFromEnv,
@@ -1096,9 +1097,10 @@ export async function getAccountId(): Promise<string | undefined> {
 
 	// check if we have a cached value
 	const cachedAccount = getAccountFromCache();
-	if (cachedAccount) {
+	if (cachedAccount && !getCloudflareAccountIdFromEnv()) {
 		return cachedAccount.id;
 	}
+
 	const accounts = await getAccountChoices();
 	if (accounts.length === 1) {
 		saveAccountToCache({ id: accounts[0].id, name: accounts[0].name });