Creating shared utility function

Author: Vandita Patidar

packages/core/src/awsService/appBuilder/serverlessLand/main.ts

@@ -15,6 +15,7 @@ import { ExtContext } from '../../../shared/extensions'
 import { addFolderToWorkspace } from '../../../shared/utilities/workspaceUtils'
 import { ToolkitError } from '../../../shared/errors'
 import { fs } from '../../../shared/fs/fs'
+import { confirmOverwriteIfExists } from '../../../shared/utilities/messages'
 import { getPattern } from '../../../shared/utilities/downloadPatterns'
 import { MetadataManager } from './metadataManager'
 
@@ -90,19 +91,12 @@ export async function downloadPatternCode(config: CreateServerlessLandWizardForm
     const fullAssetName = assetName + '.zip'
     const location = vscode.Uri.joinPath(config.location, config.name)
 
+    const shouldProceed = await confirmOverwriteIfExists(location, config.name)
+    if (!shouldProceed) {
+        throw new ToolkitError(`Folder already exists: ${config.name}`)
+    }
+
     if (await fs.exists(location)) {
-        const choice = await vscode.window.showInformationMessage(
-            localize(
-                'AWS.toolkit.serverlessLand.fileExistsPrompt',
-                '{0} already exists in the selected directory, overwrite?',
-                config.name
-            ),
-            'Yes',
-            'No'
-        )
-        if (choice !== 'Yes') {
-            throw new ToolkitError(`Folder already exists: ${config.name}`)
-        }
         await vscode.workspace.fs.delete(location)
     }
     try {

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

@@ -14,6 +14,7 @@ import { Timeout } from './timeoutUtils'
 import { addCodiconToString } from './textUtilities'
 import { getIcon, codicon } from '../icons'
 import globals from '../extensionGlobals'
+import { fs } from '../../shared/fs/fs'
 import { openUrl } from './vsCodeUtils'
 import { AmazonQPromptSettings, ToolkitPromptSettings } from '../../shared/settings'
 import { telemetry, ToolkitShowNotification } from '../telemetry/telemetry'
@@ -140,6 +141,29 @@ export async function showViewLogsMessage(
     })
 }
 
+/**
+ * Checks if a path exists and prompts user for overwrite confirmation if it does.
+ * @param path The file or directory path to check
+ * @param itemName The name of the item for display in the message
+ * @returns Promise<boolean> - true if should proceed (path doesn't exist or user confirmed overwrite)
+ */
+export async function confirmOverwriteIfExists(path: vscode.Uri, itemName: string): Promise<boolean> {
+    if (!(await fs.exists(path))) {
+        return true
+    }
+
+    return showConfirmationMessage({
+        prompt: localize(
+            'AWS.toolkit.confirmOverwrite',
+            '{0} already exists in the selected directory, overwrite?',
+            itemName
+        ),
+        confirm: localize('AWS.generic.overwrite', 'Yes'),
+        cancel: localize('AWS.generic.cancel', 'No'),
+        type: 'warning',
+    })
+}
+
 /**
  * Shows a modal confirmation (warning) message with buttons to confirm or cancel.
  *

packages/core/src/test/awsService/appBuilder/serverlessLand/main.test.ts

@@ -19,11 +19,11 @@ import {
     getProjectUri,
     downloadPatternCode,
 } from '../../../../awsService/appBuilder/serverlessLand/main'
-import { getTestWindow } from '../../../shared/vscode/window'
 import { fs } from '../../../../shared/fs/fs'
 import * as downloadPatterns from '../../../../shared/utilities/downloadPatterns'
 import { ExtContext } from '../../../../shared/extensions'
 import { workspaceUtils } from '../../../../shared'
+import * as messages from '../../../../shared/utilities/messages'
 import * as downloadPattern from '../../../../shared/utilities/downloadPatterns'
 import * as wizardModule from '../../../../awsService/appBuilder/serverlessLand/wizard'
 
@@ -116,20 +116,28 @@ describe('downloadPatternCode', () => {
         sandbox.restore()
         getPatternStub.restore()
     })
-
     it('successfully downloads pattern code', async () => {
+        sandbox.stub(messages, 'confirmOverwriteIfExists').resolves(true)
+
         await downloadPatternCode(mockConfig, mockConfig.assetName)
         assertDownloadPatternCall(getPatternStub, mockConfig)
     })
-
     it('downloads pattern when directory exists and user confirms overwrite', async function () {
-        getTestWindow().onDidShowMessage((message) => {
-            message.selectItem('Yes')
-        })
+        sandbox.stub(messages, 'confirmOverwriteIfExists').resolves(true)
+        sandbox.stub(vscode.workspace, 'fs').value({ delete: sandbox.stub().resolves() })
 
         await downloadPatternCode(mockConfig, mockConfig.assetName)
         assertDownloadPatternCall(getPatternStub, mockConfig)
     })
+    it('throws error when directory exists and user cancels overwrite', async function () {
+        sandbox.stub(fs, 'exists').resolves(true)
+        sandbox.stub(messages, 'confirmOverwriteIfExists').resolves(false)
+
+        await assert.rejects(
+            () => downloadPatternCode(mockConfig, mockConfig.assetName),
+            /Folder already exists: test-project/
+        )
+    })
 })
 
 describe('openReadmeFile', () => {