From 3afd74a95723281b69223c547308ff4dc1c927c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Wed, 13 Aug 2025 20:25:18 +0200 Subject: [PATCH] Fix faifax default cloud shell region. (#2201) --- src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx | 5 ++++- src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx index 9a9775d93..9e3396449 100644 --- a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx +++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx @@ -22,6 +22,7 @@ import { formatErrorMessage, formatInfoMessage, formatWarningMessage } from "./U // Constants const DEFAULT_CLOUDSHELL_REGION = "westus"; +const DEFAULT_FAIRFAX_CLOUDSHELL_REGION = "usgovvirginia"; const POLLING_INTERVAL_MS = 2000; const MAX_RETRY_COUNT = 10; const MAX_PING_COUNT = 120 * 60; // 120 minutes (60 seconds/minute) @@ -153,7 +154,9 @@ export const ensureCloudShellProviderRegistered = async (): Promise => { * Determines the appropriate CloudShell region */ export const determineCloudShellRegion = (): string => { - return getNormalizedRegion(userContext.databaseAccount?.location, DEFAULT_CLOUDSHELL_REGION); + const defaultRegion = + userContext.portalEnv === "fairfax" ? DEFAULT_FAIRFAX_CLOUDSHELL_REGION : DEFAULT_CLOUDSHELL_REGION; + return getNormalizedRegion(userContext.databaseAccount?.location, defaultRegion); }; /** diff --git a/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx b/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx index b36ed9e4e..f9d4516fa 100644 --- a/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx +++ b/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx @@ -8,6 +8,8 @@ const validCloudShellRegions = new Set([ "centralindia", "southeastasia", "westcentralus", + "usgovvirginia", + "usgovarizona", ]); /**