circurlar dependency

Author: Will-ShaoHua

packages/core/src/codewhisperer/activation.ts

@@ -72,7 +72,12 @@ import { AuthUtil } from './util/authUtil'
 import { ImportAdderProvider } from './service/importAdderProvider'
 import { TelemetryHelper } from './util/telemetryHelper'
 import { openUrl } from '../shared/utilities/vsCodeUtils'
-import { notifyNewCustomizations } from './util/customizationUtil'
+import {
+    getAvailableCustomizationsList,
+    getSelectedCustomization,
+    notifyNewCustomizations,
+    switchToBaseCustomizationAndNotify,
+} from './util/customizationUtil'
 import { CodeWhispererCommandBackend, CodeWhispererCommandDeclarations } from './commands/gettingStartedPageCommands'
 import { SecurityIssueHoverProvider } from './service/securityIssueHoverProvider'
 import { SecurityIssueCodeActionProvider } from './service/securityIssueCodeActionProvider'
@@ -337,7 +342,26 @@ export async function activate(context: ExtContext): Promise<void> {
             [...CodeWhispererConstants.securityScanLanguageIds],
             SecurityIssueCodeActionProvider.instance
         ),
-        vscode.commands.registerCommand('aws.amazonq.openEditorAtRange', openEditorAtRange)
+        vscode.commands.registerCommand('aws.amazonq.openEditorAtRange', openEditorAtRange),
+        auth.regionProfileManager.onDidChangeRegionProfile(() => {
+            // validate user's still has access to the selected customization
+            const selectedCustomization = getSelectedCustomization()
+            // no need to validate base customization which has empty arn
+            if (selectedCustomization.arn.length > 0) {
+                getAvailableCustomizationsList()
+                    .then((customizations) => {
+                        const r = customizations.find((it) => it.arn === selectedCustomization.arn)
+                        if (!r) {
+                            void switchToBaseCustomizationAndNotify().then()
+                        }
+                    })
+                    .catch((e) => {
+                        getLogger().error(
+                            `encounter error while validating selected customization on profile change: ${(e as Error).message}`
+                        )
+                    })
+            }
+        })
     )
 
     // run the auth startup code with context for telemetry

packages/core/src/codewhisperer/region/regionProfileManager.ts

@@ -28,11 +28,6 @@ import { parse } from '@aws-sdk/util-arn-parser'
 import { isAwsError, ToolkitError } from '../../shared/errors'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { localize } from '../../shared/utilities/vsCodeUtils'
-import {
-    getAvailableCustomizationsList,
-    getSelectedCustomization,
-    switchToBaseCustomizationAndNotify,
-} from '../util/customizationUtil'
 
 // TODO: is there a better way to manage all endpoint strings in one place?
 export const defaultServiceConfig: CodeWhispererConfig = {
@@ -41,7 +36,6 @@ export const defaultServiceConfig: CodeWhispererConfig = {
 }
 
 // Hack until we have a single discovery endpoint. We will call each endpoint one by one to fetch profile before then.
-// TODO: update correct endpoint and region
 const endpoints = createConstantMap({
     'us-east-1': 'https://q.us-east-1.amazonaws.com/',
     'eu-central-1': 'https://q.eu-central-1.amazonaws.com/',
@@ -224,24 +218,6 @@ export class RegionProfileManager {
 
         // persist to state
         await this.persistSelectRegionProfile()
-
-        // validate user's still has access to the selected customization
-        const selectedCustomization = getSelectedCustomization()
-        // no need to validate base customization which has empty arn
-        if (selectedCustomization.arn.length > 0) {
-            getAvailableCustomizationsList()
-                .then((customizations) => {
-                    const r = customizations.find((it) => it.arn === selectedCustomization.arn)
-                    if (!r) {
-                        void switchToBaseCustomizationAndNotify().then()
-                    }
-                })
-                .catch((e) => {
-                    RegionProfileManager.logger.error(
-                        `encounter error while validating selected customization on profile change: ${(e as Error).message}`
-                    )
-                })
-        }
     }
 
     restoreProfileSelection = once(async () => {