merge in upstream changes

Author: Hweinstock

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q Developer: Updated legal disclaimer text"
+}

packages/amazonq/.changes/next-release/Feature-cc8c85c0-3b9b-4a8c-b0fc-b69439f90d82.json

@@ -502,8 +502,6 @@
         "mime-types": "^2.1.32",
         "node-fetch": "^2.7.0",
         "portfinder": "^1.0.32",
-        "proper-lockfile": "^4.1.2",
-        "ps-list": "^8.1.1",
         "semver": "^7.5.4",
         "stream-buffers": "^3.0.2",
         "strip-ansi": "^5.2.0",

packages/core/package.json

@@ -80,8 +80,8 @@
     "AWS.command.apig.copyUrl": "Copy URL",
     "AWS.command.apig.invokeRemoteRestApi": "Invoke on AWS",
     "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",
-    "AWS.command.applicationComposer.open": "Open with Application Composer",
-    "AWS.command.applicationComposer.openDialog": "Open Template with Application Composer...",
+    "AWS.command.applicationComposer.open": "Open with Infrastructure Composer",
+    "AWS.command.applicationComposer.openDialog": "Open Template with Infrastructure Composer...",
     "AWS.command.auth.addConnection": "Add New Connection",
     "AWS.command.auth.showConnectionsPage": "Add New Connection",
     "AWS.command.auth.switchConnections": "Switch Connections",
@@ -227,7 +227,7 @@
     "AWS.lambda.explorerTitle": "Explorer",
     "AWS.developerTools.explorerTitle": "Developer Tools",
     "AWS.codewhisperer.explorerTitle": "CodeWhisperer",
-    "AWS.appcomposer.explorerTitle": "Application Composer",
+    "AWS.appcomposer.explorerTitle": "Infrastructure Composer",
     "AWS.cdk.explorerTitle": "CDK",
     "AWS.codecatalyst.explorerTitle": "CodeCatalyst",
     "AWS.cwl.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs (max 10000)",

packages/core/package.nls.json

@@ -30,7 +30,7 @@ export class TabDataGenerator {
         const tabData: MynahUIDataModel = {
             tabTitle: taskName ?? TabTypeDataMap[tabType].title,
             promptInputInfo:
-                'Use of Amazon Q is subject to the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
+                'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
             quickActionCommands: this.quickActionsGenerator.generateForTab(tabType),
             promptInputPlaceholder: TabTypeDataMap[tabType].placeholder,
             contextCommands: [

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -33,7 +33,7 @@ export class ApplicationComposerCodeLensProvider implements vscode.CodeLensProvi
         }
         const resourcesLoc = new vscode.Range(codeLensLine, 0, codeLensLine, 0)
         const codeLens = openTemplateInComposerCommand.build().asCodeLens(resourcesLoc, {
-            title: localize('AWS.applicationComposer.codeLens.title', 'Visualize with Application Composer'),
+            title: localize('AWS.applicationComposer.codeLens.title', 'Visualize with Infrastructure Composer'),
             tooltip: localize(
                 'AWS.applicationComposer.codeLens.tooltip',
                 'Visually design and build modern applications quickly'

packages/core/src/applicationcomposer/codeLensProvider.ts

@@ -119,7 +119,11 @@ export class ApplicationComposer {
     ): vscode.WebviewPanel {
         const panel = vscode.window.createWebviewPanel(
             'applicationComposer',
-            localize('AWS.applicationComposer.title', '{0} (Application Composer)', path.basename(documentUri.fsPath)),
+            localize(
+                'AWS.applicationComposer.title',
+                '{0} (Infrastructure Composer)',
+                path.basename(documentUri.fsPath)
+            ),
             {
                 preserveFocus: true,
                 viewColumn: vscode.ViewColumn.Active,

packages/core/src/applicationcomposer/composerWebview.ts

@@ -7,5 +7,5 @@ import { submitFeedback } from '../../feedback/vue/submitFeedback'
 import { placeholder } from '../../shared/vscode/commands2'
 
 export function openFeedbackMessageHandler() {
-    void submitFeedback(placeholder, 'Application Composer')
+    void submitFeedback(placeholder, 'Infrastructure Composer')
 }

packages/core/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts

@@ -116,7 +116,7 @@ export class ApplicationComposerManager {
         void vscode.window.showInformationMessage(
             localize(
                 'AWS.applicationComposer.visualisation.errors.rendering',
-                'There was an error rendering Application Composer, check logs for details.'
+                'There was an error rendering Infrastructure Composer, check logs for details.'
             )
         )
         this.logger.error(`${this.name}: Unable to show App Composer webview: ${err}`)

packages/core/src/applicationcomposer/webviewManager.ts

@@ -8,7 +8,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { getLogger, Logger } from '../../../shared/logger'
 import { localize } from '../../../shared/utilities/vsCodeUtils'
-import { VueWebview } from '../../../webviews/main'
+import { VueWebview, VueWebviewPanel } from '../../../webviews/main'
 import { ExtContext } from '../../../shared/extensions'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { AccessAnalyzer, SharedIniFileCredentials } from 'aws-sdk'
@@ -31,8 +31,8 @@ import { ExpiredTokenException } from '@aws-sdk/client-sso-oidc'
 
 const defaultTerraformConfigPath = 'resources/policychecks-tf-default.yaml'
 // Diagnostics for Custom checks are shared
-const customPolicyCheckDiagnosticCollection = vscode.languages.createDiagnosticCollection('customPolicyCheck')
-const validatePolicyDiagnosticCollection = vscode.languages.createDiagnosticCollection('validatePolicy')
+export const customPolicyCheckDiagnosticCollection = vscode.languages.createDiagnosticCollection('customPolicyCheck')
+export const validatePolicyDiagnosticCollection = vscode.languages.createDiagnosticCollection('validatePolicy')
 
 export interface IamPolicyChecksInitialData {
     checkNoNewAccessFilePath: string
@@ -56,7 +56,7 @@ export class IamPolicyChecksWebview extends VueWebview {
     public static readonly sourcePath: string = 'src/awsService/accessanalyzer/vue/index.js'
     public readonly id = 'iamPolicyChecks'
     private static editedDocumentUri: vscode.Uri
-    private static editedDocumentFileName: string
+    public static editedDocumentFileName: string
     private static editedDocument: string
 
     public constructor(
@@ -119,14 +119,18 @@ export class IamPolicyChecksWebview extends VueWebview {
         // Send the current active text editor to Webview to show what is being targeted by the user
         vscode.window.onDidChangeActiveTextEditor((message: any) => {
             const editedFile = vscode.window.activeTextEditor?.document
-            IamPolicyChecksWebview.editedDocumentFileName = editedFile!.uri.path
-            IamPolicyChecksWebview.editedDocument = editedFile!.getText()
-            IamPolicyChecksWebview.editedDocumentUri = editedFile!.uri
-            this.onChangeInputPath.fire(editedFile!.uri.path)
+            if (editedFile !== undefined) {
+                IamPolicyChecksWebview.editedDocumentFileName = editedFile.uri.path
+                IamPolicyChecksWebview.editedDocument = editedFile.getText()
+                IamPolicyChecksWebview.editedDocumentUri = editedFile.uri
+                this.onChangeInputPath.fire(editedFile.uri.path)
+            }
         })
         vscode.workspace.onDidChangeTextDocument((message: any) => {
             const editedFile = vscode.window.activeTextEditor?.document
-            IamPolicyChecksWebview.editedDocument = editedFile!.getText()
+            if (editedFile !== undefined) {
+                IamPolicyChecksWebview.editedDocument = editedFile.getText()
+            }
         })
     }
 
@@ -715,10 +719,10 @@ export class IamPolicyChecksWebview extends VueWebview {
     }
 
     public pushCustomCheckDiagnostic(diagnostics: vscode.Diagnostic[], finding: any, isBlocking: boolean) {
-        const message = `${finding.findingType}: ${finding.message} - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName}`
-        if (message.includes('existingPolicyDocument')) {
-            message.replace('existingPolicyDocument', 'reference document')
-        }
+        const findingMessage: string = finding.message.includes('existingPolicyDocument')
+            ? finding.message.replace('existingPolicyDocument', 'reference document')
+            : finding.message
+        const message = `${finding.findingType}: ${findingMessage} - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName}`
         if (finding.details.reasons) {
             finding.details.reasons.forEach((reason: any) => {
                 diagnostics.push(
@@ -744,7 +748,7 @@ export class IamPolicyChecksWebview extends VueWebview {
 
 const Panel = VueWebview.compilePanel(IamPolicyChecksWebview)
 
-export async function renderIamPolicyChecks(context: ExtContext): Promise<void> {
+export async function renderIamPolicyChecks(context: ExtContext): Promise<VueWebviewPanel | undefined> {
     const logger: Logger = getLogger()
     try {
         const client = new AccessAnalyzer({ region: context.regionProvider.defaultRegionId })
@@ -795,13 +799,14 @@ export async function renderIamPolicyChecks(context: ExtContext): Promise<void>
             viewColumn: vscode.ViewColumn.Beside,
             title: localize('AWS.iamPolicyChecks.title', 'IAM Policy Checks'),
         })
+        return wv
     } catch (err) {
         logger.error(err as Error)
     }
 }
 
 // Helper function to get document contents from a path
-async function _readCustomChecksFile(input: string): Promise<string> {
+export async function _readCustomChecksFile(input: string): Promise<string> {
     if (fs.existsSync(input)) {
         return fs.readFileSync(input).toString()
     } else {
@@ -823,7 +828,7 @@ async function _readCustomChecksFile(input: string): Promise<string> {
 }
 
 //Check if Cfn and Tf tools are installed
-function arePythonToolsInstalled(): boolean {
+export function arePythonToolsInstalled(): boolean {
     const logger: Logger = getLogger()
     let cfnToolInstalled = true
     let tfToolInstalled = true
@@ -846,12 +851,12 @@ function arePythonToolsInstalled(): boolean {
     return cfnToolInstalled && tfToolInstalled
 }
 
-function isProcessNotFoundErr(errMsg: string) {
+export function isProcessNotFoundErr(errMsg: string) {
     return errMsg.includes('command not found') || errMsg.includes('ENOENT')
 }
 
 // Since TypeScript can only get the CLI tool's error output as a string, we have to parse and sanitize it ourselves
-function parseCliErrorMessage(message: string, documentType: PolicyChecksDocumentType): string {
+export function parseCliErrorMessage(message: string, documentType: PolicyChecksDocumentType): string {
     const cfnMatch = message.match(/ERROR: .*/)
     const botoMatch = message.match(/(?<=botocore\.exceptions\.).*/) // Boto errors have a special match
     const terraformMatch = message.match(/AttributeError:.*/) // Terraform CLI responds with a different error schema... this catches invalid .json plans
@@ -876,7 +881,7 @@ function parseCliErrorMessage(message: string, documentType: PolicyChecksDocumen
     return message
 }
 
-function getCheckNoNewAccessErrorMessage(finding: any) {
+export function getCheckNoNewAccessErrorMessage(finding: any) {
     if (finding.findingType === 'ERROR') {
         if (
             finding.message.includes(
@@ -888,7 +893,7 @@ function getCheckNoNewAccessErrorMessage(finding: any) {
     }
 }
 
-function getResultCssColor(resultType: PolicyChecksResult): string {
+export function getResultCssColor(resultType: PolicyChecksResult): string {
     switch (resultType) {
         case 'Success':
             return 'var(--vscode-terminal-ansiGreen)'
@@ -899,17 +904,17 @@ function getResultCssColor(resultType: PolicyChecksResult): string {
     }
 }
 
-function isCloudFormationTemplate(document: string): boolean {
+export function isCloudFormationTemplate(document: string): boolean {
     const cfnFileTypes = ['.yaml', '.yml', '.json']
     return cfnFileTypes.some((t) => document.endsWith(t))
 }
 
-function isTerraformPlan(document: string) {
+export function isTerraformPlan(document: string) {
     const terraformPlanFileTypes = ['.json']
     return terraformPlanFileTypes.some((t) => document.endsWith(t))
 }
 
-function isJsonPolicyLanguage(document: string) {
+export function isJsonPolicyLanguage(document: string) {
     const policyLanguageFileTypes = ['.json']
     return policyLanguageFileTypes.some((t) => document.endsWith(t))
 }