Merge master into feature/model-selection

Author: aws-toolkit-automation

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

@@ -482,7 +482,10 @@ export function errorPromptHelper(
         })
     }
     if (error.code !== 'NoSourceFilesError') {
-        void vscode.window.showWarningMessage(getErrorMessage(error), ok)
+        // Skip showing warning messages during tests to avoid interfering with test dialogs
+        if (process.env.NODE_ENV !== 'test') {
+            void vscode.window.showWarningMessage(getErrorMessage(error), ok)
+        }
     }
 }
 

packages/core/src/test/shared/sam/build.test.ts

@@ -512,6 +512,9 @@ describe('SAM runBuild', () => {
                 })
                 .build()
 
+            // Reset the spy before running the test to ensure clean state
+            spyRunInterminal.resetHistory()
+
             // Instead of await runBuild(), prefer this to avoid flakiness due to race condition
             await delayedRunBuild()
 

packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts

@@ -317,7 +317,12 @@ describe('SamDebugConfigurationProvider', async function () {
             )
 
             // No workspace folder:
+            // Stub vscode.workspace.workspaceFolders to be undefined to ensure rejection
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value(undefined)
             await assert.rejects(() => debugConfigProvider.makeConfig(undefined, config.config))
+            // Restore for subsequent tests
+            sandbox.restore()
+            sandbox = sinon.createSandbox()
 
             // No launch.json (vscode will pass an empty config.request):
             await assert.rejects(() => debugConfigProvider.makeConfig(undefined, { ...config.config, request: '' }))

packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts

@@ -129,28 +129,28 @@ describe('Application Builder', async () => {
             )
             assert.strictEqual(lambdaResourceNode.id, 'AppBuilderProjectLambda')
             const lambdaTreeItemProperties = lambdaResourceNode.getTreeItem()
-            assert.strictEqual(lambdaTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(lambdaTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
             assert.strictEqual(lambdaTreeItemProperties.iconPath?.toString(), '$(aws-lambda-function)')
 
             // Validate s3 bucket
             const s3BucketResourceNode = getResourceNodeByType(appBuilderTestAppResourceNodes, 'AWS::S3::Bucket')
             assert.strictEqual(s3BucketResourceNode.id, 'AppBuilderProjectBucket')
             const s3BucketTreeItemProperties = s3BucketResourceNode.getTreeItem()
-            assert.strictEqual(s3BucketTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(s3BucketTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
             assert.strictEqual(s3BucketTreeItemProperties.iconPath?.toString(), '$(aws-s3-bucket)')
 
             // Validate s3 policy
             const s3PolicyResourceNode = getResourceNodeByType(appBuilderTestAppResourceNodes, 'AWS::S3::BucketPolicy')
             assert.strictEqual(s3PolicyResourceNode.id, 'AppBuilderProjectBucketBucketPolicy')
             const s3PolicyTreeItemProperties = s3PolicyResourceNode.getTreeItem()
-            assert.strictEqual(s3PolicyTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(s3PolicyTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
             assert.strictEqual(s3PolicyTreeItemProperties.iconPath?.toString(), '$(info)')
 
             // Validate api gateway resource node
             const apigwResourceNode = getResourceNodeByType(appBuilderTestAppResourceNodes, 'AWS::Serverless::Api')
             assert.strictEqual(apigwResourceNode.id, 'AppBuilderProjectAPI')
             const apigwTreeItemProperties = apigwResourceNode.getTreeItem()
-            assert.strictEqual(apigwTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(apigwTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
             assert.strictEqual(apigwTreeItemProperties.iconPath?.toString(), '$(info)')
         })
 

packages/core/src/testInteg/sam.test.ts

@@ -123,7 +123,6 @@ function generateScenario(
 
 const scenarios: TestScenario[] = [
     // zips
-    generateScenario('nodejs', '18.x'),
     generateScenario('nodejs', '20.x'),
     generateScenario('nodejs', '22.x', { vscodeMinimum: '1.78.0' }),
     generateScenario('python', '3.10'),
@@ -135,7 +134,6 @@ const scenarios: TestScenario[] = [
     generateScenario('java', '11', { sourceTag: 'Gradle' }),
     generateScenario('java', '17', { sourceTag: 'Gradle' }),
     // images
-    generateScenario('nodejs', '18.x', { baseImage: 'amazon/nodejs18.x-base' }, true),
     generateScenario('nodejs', '20.x', { baseImage: 'amazon/nodejs20.x-base' }, true),
     generateScenario('nodejs', '22.x', { baseImage: 'amazon/nodejs22.x-base', vscodeMinimum: '1.78.0' }, true),
     generateScenario('python', '3.10', { baseImage: 'amazon/python3.10-base' }, true),