refactor(settings): minimize duplication across prompt settings.

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -808,7 +808,7 @@ class DiskCacheErrorMessage {
             : ToolkitPromptSettings.instance
 
         // We know 'ssoCacheError' is in all extension prompt settings
-        if (await promptSettings.isPromptEnabled('ssoCacheError')) {
+        if (promptSettings.isPromptEnabled('ssoCacheError')) {
             const result = await showMessage()
             if (result === dontShow) {
                 await promptSettings.disablePrompt('ssoCacheError')

packages/core/src/awsService/apprunner/commands/pauseService.ts

@@ -18,7 +18,7 @@ export async function pauseService(node: AppRunnerServiceNode): Promise<void> {
 
     try {
         const prompts = ToolkitPromptSettings.instance
-        const shouldNotify = await prompts.isPromptEnabled('apprunnerNotifyPause')
+        const shouldNotify = prompts.isPromptEnabled('apprunnerNotifyPause')
         const notifyPrompt = localize(
             'aws.apprunner.pauseService.notify',
             'Your service will be unavailable while paused. ' +

packages/core/src/awsService/apprunner/wizards/deploymentButton.ts

@@ -32,7 +32,7 @@ function makeDeployButtons() {
 async function showDeploymentCostNotification(): Promise<void> {
     const settings = ToolkitPromptSettings.instance
 
-    if (await settings.isPromptEnabled('apprunnerNotifyPricing')) {
+    if (settings.isPromptEnabled('apprunnerNotifyPricing')) {
         const notice = localize(
             'aws.apprunner.createService.priceNotice.message',
             'App Runner automatic deployments incur an additional cost.'

packages/core/src/awsService/ecs/commands.ts

@@ -32,7 +32,7 @@ async function runCommandWizard(
 
     const wizard = new CommandWizard(
         container,
-        await ToolkitPromptSettings.instance.isPromptEnabled('ecsRunCommand'),
+        ToolkitPromptSettings.instance.isPromptEnabled('ecsRunCommand'),
         command
     )
     const response = await wizard.run()
@@ -75,7 +75,7 @@ export async function toggleExecuteCommandFlag(
               'Disabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\n Continue?'
           )
 
-    if (await settings.isPromptEnabled(prompt)) {
+    if (settings.isPromptEnabled(prompt)) {
         const choice = await window.showWarningMessage(warningMessage, yes, yesDontAskAgain, no)
         if (choice === undefined || choice === no) {
             throw new CancellationError('user')

packages/core/src/awsService/s3/fileViewerManager.ts

@@ -346,7 +346,7 @@ export class S3FileViewerManager {
     }
 
     private async showEditNotification(): Promise<void> {
-        if (!(await this.settings.isPromptEnabled(promptOnEditKey))) {
+        if (!this.settings.isPromptEnabled(promptOnEditKey)) {
             return
         }
 

packages/core/src/codecatalyst/activation.ts

@@ -128,7 +128,7 @@ export async function activate(ctx: ExtContext): Promise<void> {
         await showReadmeFileOnFirstLoad(ctx.extensionContext.workspaceState)
 
         const settings = ToolkitPromptSettings.instance
-        if (await settings.isPromptEnabled('remoteConnected')) {
+        if (settings.isPromptEnabled('remoteConnected')) {
             const message = localize(
                 'AWS.codecatalyst.connectedMessage',
                 'Welcome to your Amazon CodeCatalyst Dev Environment. For more options and information, view Dev Environment settings ({0} Extension > CodeCatalyst).',

packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts

@@ -20,7 +20,7 @@ export class CodeWhispererCommandBackend {
 
         const prompts = AmazonQPromptSettings.instance
         // To check the condition If the user has already seen the welcome message
-        if (!(await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage'))) {
+        if (!prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) {
             telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true })
         }
         return showCodeWhispererWebview(this.extContext, source)

packages/core/src/codewhisperer/util/authUtil.ts

@@ -366,7 +366,7 @@ export class AuthUtil {
     public async notifySessionConfiguration() {
         const suppressId = 'amazonQSessionConfigurationMessage'
         const settings = AmazonQPromptSettings.instance
-        const shouldShow = await settings.isPromptEnabled(suppressId)
+        const shouldShow = settings.isPromptEnabled(suppressId)
         if (!shouldShow) {
             return
         }

packages/core/src/codewhisperer/vue/backend.ts

@@ -161,7 +161,7 @@ export async function showCodeWhispererWebview(
         ]
         const prompts = AmazonQPromptSettings.instance
         // To check the condition If the user has already seen the welcome message
-        if (await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) {
+        if (prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) {
             telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: true })
         } else {
             telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: false })

packages/core/src/shared/awsContextCommands.ts

@@ -65,7 +65,7 @@ export class AwsContextCommands {
         await this.editCredentials()
         if (
             credentialsFiles.length === 0 &&
-            (await ToolkitPromptSettings.instance.isPromptEnabled('createCredentialsProfile')) &&
+            ToolkitPromptSettings.instance.isPromptEnabled('createCredentialsProfile') &&
             (await this.promptCredentialsSetup())
         ) {
             await this.onCommandCreateCredentialsProfile()

packages/core/src/shared/extensionStartup.ts

@@ -24,7 +24,7 @@ const localize = nls.loadMessageBundle()
  */
 export async function maybeShowMinVscodeWarning(minVscode: string) {
     const settings = isAmazonQ() ? AmazonQPromptSettings.instance : ToolkitPromptSettings.instance
-    if (!(await settings.isPromptEnabled('minIdeVersion'))) {
+    if (!settings.isPromptEnabled('minIdeVersion')) {
         return
     }
     const updateButton = `Update ${vscode.env.appName}`

packages/core/src/shared/sam/activation.ts

@@ -323,7 +323,7 @@ async function createYamlExtensionPrompt(): Promise<void> {
     // Show this only in VSCode since other VSCode-like IDEs (e.g. Theia) may
     // not have a marketplace or contain the YAML plugin.
     if (
-        (await settings.isPromptEnabled('yamlExtPrompt')) &&
+        settings.isPromptEnabled('yamlExtPrompt') &&
         getIdeType() === 'vscode' &&
         !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml)
     ) {

packages/core/src/shared/sam/sync.ts

@@ -520,7 +520,7 @@ async function updateSyncRecentResponse(region: string, key: string, value: stri
 }
 
 export async function confirmDevStack() {
-    const canPrompt = await ToolkitPromptSettings.instance.isPromptEnabled('samcliConfirmDevStack')
+    const canPrompt = ToolkitPromptSettings.instance.isPromptEnabled('samcliConfirmDevStack')
     if (!canPrompt) {
         return
     }

packages/core/src/shared/settings.ts

@@ -600,7 +600,7 @@ export function fromExtensionManifest<T extends TypeDescriptor & Partial<Section
  *
  * ### Usage:
  * ```
- * if (await settings.isPromptEnabled('myPromptName')) {
+ * if (settings.isPromptEnabled('myPromptName')) {
  *     // Show some sort of prompt
  *     const userResponse = await promptUser()
  *
@@ -619,68 +619,44 @@ export function fromExtensionManifest<T extends TypeDescriptor & Partial<Section
  * core lib as necessary.
  */
 export const toolkitPrompts = settingsProps['aws.suppressPrompts']
-type toolkitPromptName = keyof typeof toolkitPrompts
-export class ToolkitPromptSettings
-    extends Settings.define(
-        'aws.suppressPrompts',
-        toRecord(keys(toolkitPrompts), () => Boolean)
-    )
-    implements PromptSettings
-{
-    public async isPromptEnabled(promptName: toolkitPromptName): Promise<boolean> {
-        try {
-            return !this._getOrThrow(promptName, false)
-        } catch (e) {
-            this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)
-            await this.reset()
-
-            return true
-        }
-    }
-
-    public async disablePrompt(promptName: toolkitPromptName): Promise<void> {
-        if (await this.isPromptEnabled(promptName)) {
-            await this.update(promptName, true)
-        }
-    }
-
-    static #instance: ToolkitPromptSettings
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-}
+export const ToolkitPromptSettings = getPromptSettings('aws.suppressPrompts')
+export type ToolkitPromptSettings = InstanceType<typeof ToolkitPromptSettings>
 
 export const amazonQPrompts = settingsProps['amazonQ.suppressPrompts']
-type amazonQPromptName = keyof typeof amazonQPrompts
-export class AmazonQPromptSettings
-    extends Settings.define(
-        'amazonQ.suppressPrompts',
-        toRecord(keys(amazonQPrompts), () => Boolean)
-    )
-    implements PromptSettings
-{
-    public async isPromptEnabled(promptName: amazonQPromptName): Promise<boolean> {
-        try {
-            return !this._getOrThrow(promptName, false)
-        } catch (e) {
-            this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)
-            await this.reset()
+export const AmazonQPromptSettings = getPromptSettings('amazonQ.suppressPrompts')
+export type AmazonQPromptSettings = InstanceType<typeof AmazonQPromptSettings>
+
+function getPromptSettings<P extends 'amazonQ.suppressPrompts' | 'aws.suppressPrompts'>(promptsKey: P) {
+    const prompts = settingsProps[promptsKey]
+    type promptName = keyof typeof prompts & string
+    return class AnonymousPromptSettings extends Settings.define(
+        promptsKey,
+        toRecord(keys(prompts), () => Boolean)
+    ) {
+        public isPromptEnabled(promptName: promptName) {
+            try {
+                return !this._getOrThrow(promptName, false as never)
+            } catch (e) {
+                this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)
+                this.reset().catch((e) =>
+                    getLogger().error(`failed to reset prompt settings: %O`, (e as Error).message)
+                )
 
-            return true
+                return true
+            }
         }
-    }
 
-    public async disablePrompt(promptName: amazonQPromptName): Promise<void> {
-        if (await this.isPromptEnabled(promptName)) {
-            await this.update(promptName, true)
+        public async disablePrompt(promptName: promptName) {
+            if (this.isPromptEnabled(promptName)) {
+                await this.update(promptName, true as never)
+            }
         }
-    }
 
-    static #instance: AmazonQPromptSettings
+        static #instance: AnonymousPromptSettings
 
-    public static get instance() {
-        return (this.#instance ??= new this())
+        public static get instance() {
+            return (this.#instance ??= new this())
+        }
     }
 }
 
@@ -689,10 +665,10 @@ export class AmazonQPromptSettings
  * which is the intersection of the types (only the values that occur
  * in each are selected), but idk how to do that.
  */
-type AllPromptNames = amazonQPromptName | toolkitPromptName
+type AllPromptNames = keyof typeof toolkitPrompts | keyof typeof amazonQPrompts
 
 export interface PromptSettings {
-    isPromptEnabled(promptName: AllPromptNames): Promise<boolean>
+    isPromptEnabled(promptName: AllPromptNames): boolean
     disablePrompt(promptName: AllPromptNames): Promise<void>
 }
 
@@ -708,7 +684,7 @@ type ExperimentName = keyof typeof experiments
  * ### Usage:
  * ```
  * function myExperimentalFeature(): void {
- *   if (!(await settings.isExperimentEnabled('myExperimentalFeature'))) {
+ *   if (!( settings.isExperimentEnabled('myExperimentalFeature'))) {
  *       return
  *   }
  *

packages/core/src/shared/utilities/messages.ts

@@ -194,7 +194,7 @@ export async function showReauthenticateMessage({
     reauthFunc: () => Promise<void>
     source?: string
 }) {
-    const shouldShow = await settings.isPromptEnabled(suppressId as any)
+    const shouldShow = settings.isPromptEnabled(suppressId as any)
     if (!shouldShow) {
         return
     }

packages/core/src/test/shared/settings.test.ts

@@ -498,7 +498,7 @@ describe('PromptSetting', function () {
             it(scenario.desc, async () => {
                 await settings.update(promptSettingKey, scenario.testValue)
                 const before = settings.get(promptSettingKey, Object, {})
-                const result = await sut.isPromptEnabled(promptName)
+                const result = sut.isPromptEnabled(promptName)
 
                 assert.deepStrictEqual(result, scenario.expected)
                 assert.deepStrictEqual(