Merge branch 'aws:master' into master

Hweinstock · web-flow · commit d4f7ddae63c5 · 2024-12-12T14:10:28.000-05:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json b/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Diagnostics in the problems panel are mapped to the wrong code"
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json b/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/review: Code fix automatically scrolls into view after generation."
+}
diff --git a/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts
@@ -12,6 +12,8 @@ import {
     removeDiagnostic,
     disposeSecurityDiagnostic,
     SecurityDiagnostic,
+    createSecurityDiagnostic,
+    codewhispererDiagnosticSourceLabel,
 } from 'aws-core-vscode/codewhisperer'
 import { createCodeScanIssue, createMockDocument, createTextDocumentChangeEvent } from 'aws-core-vscode/test'
 
@@ -83,4 +85,16 @@ describe('diagnosticsProvider', function () {
         assert.strictEqual(actual[1].range.start.line, 5)
         assert.strictEqual(actual[1].range.end.line, 6)
     })
+
+    it('should create securityDiagnostic from codeScanIssue', function () {
+        const codeScanIssue = createCodeScanIssue()
+        const securityDiagnostic = createSecurityDiagnostic(codeScanIssue)
+        assert.strictEqual(securityDiagnostic.findingId, codeScanIssue.findingId)
+        assert.strictEqual(securityDiagnostic.message, codeScanIssue.title)
+        assert.strictEqual(securityDiagnostic.range.start.line, codeScanIssue.startLine)
+        assert.strictEqual(securityDiagnostic.range.end.line, codeScanIssue.endLine)
+        assert.strictEqual(securityDiagnostic.severity, vscode.DiagnosticSeverity.Warning)
+        assert.strictEqual(securityDiagnostic.source, codewhispererDiagnosticSourceLabel)
+        assert.strictEqual(securityDiagnostic.code, codeScanIssue.ruleId)
+    })
 })
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -20,7 +20,7 @@
     "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
     "AWS.configuration.enableCodeLenses": "Enable SAM hints in source code and template.yaml files",
     "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
-    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `samSyncCode` - Adds an additional code-only option when synchronizing SAM applications. Code-only synchronizations are faster but can cause drift in the CloudFormation stack. Does nothing when using the legacy SAM deploy feature.\n * `iamPolicyChecks` - Enables IAM Policy Checks feature, allowing users to validate IAM policies against IAM policy grammar, AWS best practices, and specified security standards.",
+    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `ec2RemoteConnect` - Allows interfacing with EC2 instances with options to start, stop, and establish remote connections. Remote connections are done over SSM and can be through a terminal or a remote VSCode window.",
     "AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files",
     "AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
     "AWS.configuration.description.awssam.debug.api": "API Gateway configuration",
diff --git a/packages/core/src/awsexplorer/regionNode.ts b/packages/core/src/awsexplorer/regionNode.ts
@@ -29,9 +29,9 @@ import { DefaultSchemaClient } from '../shared/clients/schemaClient'
 import { getEcsRootNode } from '../awsService/ecs/model'
 import { compareTreeItems, TreeShim } from '../shared/treeview/utils'
 import { Ec2ParentNode } from '../awsService/ec2/explorer/ec2ParentNode'
-import { DevSettings } from '../shared/settings'
 import { Ec2Client } from '../shared/clients/ec2Client'
 import { isCloud9 } from '../shared/extensionUtilities'
+import { Experiments } from '../shared/settings'
 
 interface ServiceNode {
     allRegions?: boolean
@@ -65,7 +65,7 @@ const serviceCandidates: ServiceNode[] = [
     },
     {
         serviceId: 'ec2',
-        when: () => DevSettings.instance.isDevMode(),
+        when: () => Experiments.instance.isExperimentEnabled('ec2RemoteConnect'),
         createFn: (regionCode: string, partitionId: string) =>
             new Ec2ParentNode(regionCode, partitionId, new Ec2Client(regionCode)),
     },
diff --git a/packages/core/src/codewhisperer/service/diagnosticsProvider.ts b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts
@@ -74,14 +74,7 @@ export function createSecurityDiagnostic(securityIssue: CodeScanIssue) {
         vscode.DiagnosticSeverity.Warning
     )
     securityDiagnostic.source = codewhispererDiagnosticSourceLabel
-    // const detectorUrl = securityIssue.recommendation.url
-    securityDiagnostic.code = securityIssue.findingId
-    // securityDiagnostic.code = detectorUrl
-    //     ? {
-    //           value: securityIssue.detectorId,
-    //           target: vscode.Uri.parse(detectorUrl),
-    //       }
-    //     : securityIssue.detectorId
+    securityDiagnostic.code = securityIssue.ruleId
     securityDiagnostic.findingId = securityIssue.findingId
     return securityDiagnostic
 }
diff --git a/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts b/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts
@@ -24,6 +24,10 @@ import { ExtContext } from '../../../shared/extensions'
 export class SecurityIssueWebview extends VueWebview {
     public static readonly sourcePath: string = 'src/codewhisperer/views/securityIssue/vue/index.js'
     public readonly id = 'aws.codeWhisperer.securityIssue'
+    public readonly onChangeIssue = new vscode.EventEmitter<CodeScanIssue | undefined>()
+    public readonly onChangeFilePath = new vscode.EventEmitter<string | undefined>()
+    public readonly onChangeGenerateFixLoading = new vscode.EventEmitter<boolean>()
+    public readonly onChangeGenerateFixError = new vscode.EventEmitter<boolean>()
 
     private issue: CodeScanIssue | undefined
     private filePath: string | undefined
@@ -40,10 +44,12 @@ export class SecurityIssueWebview extends VueWebview {
 
     public setIssue(issue: CodeScanIssue) {
         this.issue = issue
+        this.onChangeIssue.fire(issue)
     }
 
     public setFilePath(filePath: string) {
         this.filePath = filePath
+        this.onChangeFilePath.fire(filePath)
     }
 
     public applyFix() {
@@ -90,6 +96,7 @@ export class SecurityIssueWebview extends VueWebview {
 
     public setIsGenerateFixLoading(isGenerateFixLoading: boolean) {
         this.isGenerateFixLoading = isGenerateFixLoading
+        this.onChangeGenerateFixLoading.fire(isGenerateFixLoading)
     }
 
     public getIsGenerateFixError() {
@@ -98,6 +105,7 @@ export class SecurityIssueWebview extends VueWebview {
 
     public setIsGenerateFixError(isGenerateFixError: boolean) {
         this.isGenerateFixError = isGenerateFixError
+        this.onChangeGenerateFixError.fire(isGenerateFixError)
     }
 
     public generateFix() {
@@ -189,12 +197,7 @@ const Panel = VueWebview.compilePanel(SecurityIssueWebview)
 let activePanel: InstanceType<typeof Panel> | undefined
 
 export async function showSecurityIssueWebview(ctx: vscode.ExtensionContext, issue: CodeScanIssue, filePath: string) {
-    const previousPanel = activePanel
-    const previousId = previousPanel?.server?.getIssue()?.findingId
-    if (previousPanel && previousId) {
-        previousPanel.server.closeWebview(previousId)
-    }
-    activePanel = new Panel(ctx)
+    activePanel ??= new Panel(ctx)
     activePanel.server.setIssue(issue)
     activePanel.server.setFilePath(filePath)
     activePanel.server.setIsGenerateFixLoading(false)
diff --git a/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue b/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue
@@ -47,7 +47,10 @@
             </div>
         </div>
 
-        <div v-if="isFixAvailable || isGenerateFixLoading || isGenerateFixError || isFixDescriptionAvailable">
+        <div
+            v-if="isFixAvailable || isGenerateFixLoading || isGenerateFixError || isFixDescriptionAvailable"
+            ref="codeFixSection"
+        >
             <hr />
 
             <h3>Suggested code fix preview</h3>
@@ -57,7 +60,7 @@
             </pre>
             <div class="code-block">
                 <span v-if="isFixAvailable" v-html="suggestedFixHtml"></span>
-                <div v-if="isFixAvailable" class="code-diff-actions">
+                <div v-if="isFixAvailable" class="code-diff-actions" ref="codeFixAction">
                     <button class="code-diff-action-button" @click="copyFixedCode">
                         <span class="icon icon-md icon-vscode-copy"></span> Copy
                     </button>
@@ -201,6 +204,7 @@ export default defineComponent({
     },
     created() {
         this.getData()
+        this.setupEventListeners()
     },
     beforeMount() {
         this.getData()
@@ -223,6 +227,32 @@ export default defineComponent({
             const fixedCode = await client.getFixedCode()
             this.updateFixedCode(fixedCode)
         },
+        setupEventListeners() {
+            client.onChangeIssue(async (issue) => {
+                if (issue) {
+                    this.updateFromIssue(issue)
+                }
+                const fixedCode = await client.getFixedCode()
+                this.updateFixedCode(fixedCode)
+                this.scrollTo('codeFixActions')
+            })
+            client.onChangeFilePath(async (filePath) => {
+                const relativePath = await client.getRelativePath()
+                this.updateRelativePath(relativePath)
+
+                const languageId = await client.getLanguageId()
+                if (languageId) {
+                    this.updateLanguageId(languageId)
+                }
+            })
+            client.onChangeGenerateFixLoading((isGenerateFixLoading) => {
+                this.isGenerateFixLoading = isGenerateFixLoading
+                this.scrollTo('codeFixSection')
+            })
+            client.onChangeGenerateFixError((isGenerateFixError) => {
+                this.isGenerateFixError = isGenerateFixError
+            })
+        },
         updateRelativePath(relativePath: string) {
             this.relativePath = relativePath
         },
@@ -339,6 +369,9 @@ ${this.fixedCode}
             }
             return doc.body.innerHTML
         },
+        scrollTo(refName: string) {
+            this.$nextTick(() => this.$refs?.[refName]?.scrollIntoView({ behavior: 'smooth' }))
+        },
     },
     computed: {
         severityImage() {
diff --git a/packages/core/src/shared/settings-toolkit.gen.ts b/packages/core/src/shared/settings-toolkit.gen.ts
@@ -41,7 +41,8 @@ export const toolkitSettings = {
         "ssoCacheError": {}
     },
     "aws.experiments": {
-        "jsonResourceModification": {}
+        "jsonResourceModification": {},
+        "ec2RemoteConnect": {}
     },
     "aws.resources.enabledResources": {},
     "aws.lambda.recentlyUploaded": {},
diff --git a/packages/core/src/shared/settings.ts b/packages/core/src/shared/settings.ts
@@ -726,12 +726,12 @@ export class Experiments extends Settings.define(
     'aws.experiments',
     toRecord(keys(experiments), () => Boolean)
 ) {
-    public async isExperimentEnabled(name: ExperimentName): Promise<boolean> {
+    public isExperimentEnabled(name: ExperimentName): boolean {
         try {
             return this._getOrThrow(name, false)
         } catch (error) {
             this._log(`experiment check for ${name} failed: %s`, error)
-            await this.reset()
+            this.reset().catch((e) => getLogger().error(`failed to reset experiment settings: %O`, e))
 
             return false
         }
diff --git a/packages/core/src/test/shared/settings.test.ts b/packages/core/src/test/shared/settings.test.ts
@@ -521,17 +521,17 @@ describe('Experiments', function () {
     // The `Experiments` class is basically an immutable form of `PromptSettings`
 
     it('returns false when the setting is missing', async function () {
-        assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), false)
+        assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), false)
     })
 
     it('returns false for invalid types', async function () {
         await sut.update('jsonResourceModification', 'definitely a boolean' as unknown as boolean)
-        assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), false)
+        assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), false)
     })
 
     it('returns true when the flag is set', async function () {
         await sut.update('jsonResourceModification', true)
-        assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), true)
+        assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), true)
     })
 
     it('fires events from nested settings', async function () {
diff --git a/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json b/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. "
+}
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "/review: Diagnostics in the problems panel are mapped to the wrong code"
 +}