Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into internal_falcon_release

Author: leigaol

.github/workflows/filterDuplicates.js

@@ -111,9 +111,6 @@ async function run() {
     console.log('%s duplicates found', filteredDuplicates.length)
     if (filteredDuplicates.length > 0) {
         console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
-        console.log(
-            '* Hint: if these duplicates appear unrelated to the changes, rebase onto the latest target branch.'
-        )
         process.exit(1)
     }
 }

.github/workflows/node.js.yml

@@ -84,6 +84,17 @@ jobs:
                   git remote add forkUpstream https://github.com/$REPO_NAME  # URL of the fork
                   git fetch forkUpstream  # Fetch fork
 
+            - name: Merge in target branch to avoid false negatives.
+              env:
+                  TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+              # Note: "git merge" should always succeed here, because GHA won't
+              # start the job if there are merge conflicts. https://github.com/orgs/community/discussions/11265
+              # Also, because `git merge` makes a commit, we need to establish an identity to avoid 'Committer identity unknown' error
+              run: |
+                  git config --global user.name "aws-toolkit-automation"
+                  git config --global user.email "<>"
+                  git merge origin/$TARGET_BRANCH
+
             - name: Compute git diff
               env:
                   CURRENT_BRANCH: ${{ github.head_ref }}

buildspec/release/80notify.yml

@@ -14,15 +14,13 @@ phases:
     build:
         commands:
             - echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
-            - EXTENSION_NAME=$([ "$TARGET_EXTENSION" = "amazonq" ] && echo "Amazon Q" || echo "AWS Toolkit")
-            - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
-            - CHANGELOG=$(cat packages/${TARGET_EXTENSION}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print if $. == 2')
-            - MESSAGE=$(envsubst < "$GITHUB_WORKSPACE/buildspec/release/notify.txt")
-            - DATA="{'Content':'${MESSAGE}'}"
+            - export EXTENSION_NAME=$([ "$TARGET_EXTENSION" = "amazonq" ] && echo "Amazon Q" || echo "AWS Toolkit")
+            - export VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
+            - export CHANGELOG=$(cat packages/${TARGET_EXTENSION}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print if $. == 2')
+            - MESSAGE=$(envsubst < ./buildspec/release/notify.txt)
             - |
-                # TODO: Enable for prod only after testing
-                if [ "$STAGE" = "prod" ]; then
-                  echo "SKIPPED (stage=${STAGE}): 'curl -v POST \"[SLACK_URL]\" -H \"Content-Type:application/json\" --data $DATA'"
+                if [ "$STAGE" != "prod" ]; then
+                  echo "SKIPPED (stage=${STAGE}): 'curl -v POST \"[NOTIFY_URL]\" -H \"Content-Type:application/json\" --data \"{\"Content\":\"${MESSAGE}\"}\"'"
                   exit 0
                 fi
-                curl -v POST "${NOTIFY_URL}" -H "Content-Type:application/json" --data $DATA
+                curl -v POST "${NOTIFY_URL}" -H "Content-Type:application/json" --data "{\"Content\":\"${MESSAGE}\"}"

buildspec/release/notify.txt

@@ -1,6 +1,6 @@
-Released ${EXTENSION_NAME} v${VERSION} for VSCode
+Released ${EXTENSION_NAME} v${VERSION} for VS Code
 
 ${CHANGELOG}
 
 Changelog: https://github.com/aws/aws-toolkit-vscode/blob/master/packages/${TARGET_EXTENSION}/CHANGELOG.md
-Release Arifact: https://github.com/aws/aws-toolkit-vscode/releases/tag/${TARGET_EXTENSION}/v${VERSION}
+Release Artifact: https://github.com/aws/aws-toolkit-vscode/releases/tag/${TARGET_EXTENSION}/v${VERSION}

packages/amazonq/.changes/next-release/Bug Fix-c8a60497-e42c-4141-bcfe-2c44188bc98b.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Auto-review should not remove issues from manual reviews"
+}

packages/amazonq/.changes/next-release/Feature-088c8b44-eb51-4495-84fb-2e02878ff4bc.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /doc: Add support for infrastructure diagrams"
+}

packages/amazonq/src/extension.ts

@@ -142,7 +142,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         // Give time for the extension to finish initializing.
         globals.clock.setTimeout(async () => {
             CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
-            void focusAmazonQPanel.execute(placeholder, 'firstStartUp')
+            void focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp)
         }, 1000)
     }
 }

packages/amazonq/test/unit/amazonqFeatureDev/util/files.test.ts

@@ -6,6 +6,7 @@ import * as vscode from 'vscode'
 import assert from 'assert'
 import {
     prepareRepoData,
+    PrepareRepoDataOptions,
     TelemetryHelper,
     ContentLengthError,
     maxRepoSizeBytes,
@@ -46,23 +47,23 @@ const testDevfilePrepareRepo = async (devfileEnabled: boolean) => {
         .stub(CodeWhispererSettings.instance, 'getAutoBuildSetting')
         .returns(devfileEnabled ? { [workspace.uri.fsPath]: true } : {})
 
-    await testPrepareRepoData([workspace], expectedFiles)
+    await testPrepareRepoData([workspace], expectedFiles, { telemetry: new TelemetryHelper() })
 }
 
 const testPrepareRepoData = async (
     workspaces: vscode.WorkspaceFolder[],
     expectedFiles: string[],
+    prepareRepoDataOptions: PrepareRepoDataOptions,
     expectedTelemetryMetrics?: Array<{ metricName: MetricName; value: any }>
 ) => {
     expectedFiles.sort((a, b) => a.localeCompare(b))
-    const telemetry = new TelemetryHelper()
     const result = await prepareRepoData(
         workspaces.map((ws) => ws.uri.fsPath),
         workspaces as CurrentWsFolders,
-        telemetry,
         {
             record: () => {},
-        } as unknown as Span<AmazonqCreateUpload>
+        } as unknown as Span<AmazonqCreateUpload>,
+        prepareRepoDataOptions
     )
 
     assert.strictEqual(Buffer.isBuffer(result.zipFileBuffer), true)
@@ -84,6 +85,8 @@ const testPrepareRepoData = async (
 
 describe('file utils', () => {
     describe('prepareRepoData', function () {
+        const defaultPrepareRepoDataOptions: PrepareRepoDataOptions = { telemetry: new TelemetryHelper() }
+
         afterEach(() => {
             sinon.restore()
         })
@@ -92,21 +95,33 @@ describe('file utils', () => {
             const folder = await TestFolder.create()
             await folder.write('file1.md', 'test content')
             await folder.write('file2.md', 'test content')
+            await folder.write('docs/infra.svg', 'test content')
             const workspace = getWorkspaceFolder(folder.path)
 
-            await testPrepareRepoData([workspace], ['file1.md', 'file2.md'])
+            await testPrepareRepoData([workspace], ['file1.md', 'file2.md'], defaultPrepareRepoDataOptions)
+        })
+
+        it('infrastructure diagram is included', async function () {
+            const folder = await TestFolder.create()
+            await folder.write('file1.md', 'test content')
+            await folder.write('file2.svg', 'test content')
+            await folder.write('docs/infra.svg', 'test content')
+            const workspace = getWorkspaceFolder(folder.path)
+
+            await testPrepareRepoData([workspace], ['file1.md', 'docs/infra.svg'], {
+                telemetry: new TelemetryHelper(),
+                isIncludeInfraDiagram: true,
+            })
         })
 
         it('prepareRepoData ignores denied file extensions', async function () {
             const folder = await TestFolder.create()
             await folder.write('file.mp4', 'test content')
             const workspace = getWorkspaceFolder(folder.path)
 
-            await testPrepareRepoData(
-                [workspace],
-                [],
-                [{ metricName: 'amazonq_bundleExtensionIgnored', value: { filenameExt: 'mp4', count: 1 } }]
-            )
+            await testPrepareRepoData([workspace], [], defaultPrepareRepoDataOptions, [
+                { metricName: 'amazonq_bundleExtensionIgnored', value: { filenameExt: 'mp4', count: 1 } },
+            ])
         })
 
         it('should ignore devfile.yaml when setting is disabled', async function () {
@@ -122,14 +137,18 @@ describe('file utils', () => {
             const folder = await TestFolder.create()
             await folder.write('file.md', 'test content')
             const workspace = getWorkspaceFolder(folder.path)
-            const telemetry = new TelemetryHelper()
 
             sinon.stub(fs, 'stat').resolves({ size: 2 * maxRepoSizeBytes } as vscode.FileStat)
             await assert.rejects(
                 () =>
-                    prepareRepoData([workspace.uri.fsPath], [workspace], telemetry, {
-                        record: () => {},
-                    } as unknown as Span<AmazonqCreateUpload>),
+                    prepareRepoData(
+                        [workspace.uri.fsPath],
+                        [workspace],
+                        {
+                            record: () => {},
+                        } as unknown as Span<AmazonqCreateUpload>,
+                        defaultPrepareRepoDataOptions
+                    ),
                 ContentLengthError
             )
         })
@@ -144,7 +163,11 @@ describe('file utils', () => {
             const workspace2 = getWorkspaceFolder(folder.path + '/innerFolder')
             const folderName = path.basename(folder.path)
 
-            await testPrepareRepoData([workspace1, workspace2], [`${folderName}_${workspace1.name}/${testFilePath}`])
+            await testPrepareRepoData(
+                [workspace1, workspace2],
+                [`${folderName}_${workspace1.name}/${testFilePath}`],
+                defaultPrepareRepoDataOptions
+            )
         })
     })
 })

packages/core/src/amazonq/session/sessionState.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { ToolkitError } from '../../shared/errors'
 import globals from '../../shared/extensionGlobals'
 import { getLogger } from '../../shared/logger/logger'
-import { telemetry } from '../../shared/telemetry/telemetry'
+import { AmazonqCreateUpload, Span, telemetry } from '../../shared/telemetry/telemetry'
 import { VirtualFileSystem } from '../../shared/virtualFilesystem'
 import { CodeReference, UploadHistory } from '../webview/ui/connector'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
@@ -25,7 +25,7 @@ import {
     SessionStateInteraction,
     SessionStatePhase,
 } from '../commons/types'
-import { prepareRepoData, getDeletedFileInfos, registerNewFiles } from '../util/files'
+import { prepareRepoData, getDeletedFileInfos, registerNewFiles, PrepareRepoDataOptions } from '../util/files'
 import { uploadCode } from '../util/upload'
 
 export const EmptyCodeGenID = 'EMPTY_CURRENT_CODE_GENERATION_ID'
@@ -227,11 +227,11 @@ export abstract class BasePrepareCodeGenState implements SessionState {
                 amazonqConversationId: this.config.conversationId,
                 credentialStartUrl: AuthUtil.instance.startUrl,
             })
-            const { zipFileBuffer, zipFileChecksum } = await prepareRepoData(
+            const { zipFileBuffer, zipFileChecksum } = await this.prepareProjectZip(
                 this.config.workspaceRoots,
                 this.config.workspaceFolders,
-                action.telemetry,
-                span
+                span,
+                { telemetry: action.telemetry }
             )
             const uploadId = randomUUID()
             const { uploadUrl, kmsKeyArn } = await this.config.proxyClient.createUploadUrl(
@@ -251,6 +251,15 @@ export abstract class BasePrepareCodeGenState implements SessionState {
         const nextState = this.createNextState({ ...this.config, uploadId })
         return nextState.interact(action)
     }
+
+    protected async prepareProjectZip(
+        workspaceRoots: string[],
+        workspaceFolders: CurrentWsFolders,
+        span: Span<AmazonqCreateUpload>,
+        options: PrepareRepoDataOptions
+    ) {
+        return await prepareRepoData(workspaceRoots, workspaceFolders, span, options)
+    }
 }
 
 export interface CodeGenerationParams {

packages/core/src/amazonq/util/files.ts

@@ -5,7 +5,12 @@
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { collectFiles, getWorkspaceFoldersByPrefixes } from '../../shared/utilities/workspaceUtils'
+import {
+    collectFiles,
+    CollectFilesFilter,
+    defaultExcludePatterns,
+    getWorkspaceFoldersByPrefixes,
+} from '../../shared/utilities/workspaceUtils'
 
 import { ContentLengthError, PrepareRepoFailedError } from '../../amazonqFeatureDev/errors'
 import { getLogger } from '../../shared/logger/logger'
@@ -24,27 +29,69 @@ import { isPresent } from '../../shared/utilities/collectionUtils'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { TelemetryHelper } from '../util/telemetryHelper'
 
+export const SvgFileExtension = '.svg'
+
 export async function checkForDevFile(root: string) {
     const devFilePath = root + '/devfile.yaml'
     const hasDevFile = await fs.existsFile(devFilePath)
     return hasDevFile
 }
 
+function isInfraDiagramFile(relativePath: string) {
+    return (
+        relativePath.toLowerCase().endsWith(path.join('docs', 'infra.dot')) ||
+        relativePath.toLowerCase().endsWith(path.join('docs', 'infra.svg'))
+    )
+}
+
+export type PrepareRepoDataOptions = {
+    telemetry?: TelemetryHelper
+    zip?: ZipStream
+    isIncludeInfraDiagram?: boolean
+}
+
 /**
  * given the root path of the repo it zips its files in memory and generates a checksum for it.
  */
 export async function prepareRepoData(
     repoRootPaths: string[],
     workspaceFolders: CurrentWsFolders,
-    telemetry: TelemetryHelper,
     span: Span<AmazonqCreateUpload>,
-    zip: ZipStream = new ZipStream()
+    options?: PrepareRepoDataOptions
 ) {
     try {
+        const telemetry = options?.telemetry
+        const isIncludeInfraDiagram = options?.isIncludeInfraDiagram ?? false
+        const zip = options?.zip ?? new ZipStream()
+
         const autoBuildSetting = CodeWhispererSettings.instance.getAutoBuildSetting()
         const useAutoBuildFeature = autoBuildSetting[repoRootPaths[0]] ?? false
+        const excludePatterns: string[] = []
+        let filterFn: CollectFilesFilter | undefined = undefined
+
         // We only respect gitignore file rules if useAutoBuildFeature is on, this is to avoid dropping necessary files for building the code (e.g. png files imported in js code)
-        const files = await collectFiles(repoRootPaths, workspaceFolders, true, maxRepoSizeBytes, !useAutoBuildFeature)
+        if (!useAutoBuildFeature) {
+            if (isIncludeInfraDiagram) {
+                // ensure svg is not filtered out by files search
+                excludePatterns.push(...defaultExcludePatterns.filter((p) => !p.endsWith(SvgFileExtension)))
+                // ensure only infra diagram is included from all svg files
+                filterFn = (relativePath: string) => {
+                    if (!relativePath.toLowerCase().endsWith(SvgFileExtension)) {
+                        return false
+                    }
+                    return !isInfraDiagramFile(relativePath)
+                }
+            } else {
+                excludePatterns.push(...defaultExcludePatterns)
+            }
+        }
+
+        const files = await collectFiles(repoRootPaths, workspaceFolders, {
+            maxSizeBytes: maxRepoSizeBytes,
+            excludeByGitIgnore: true,
+            excludePatterns: excludePatterns,
+            filterFn: filterFn,
+        })
 
         let totalBytes = 0
         const ignoredExtensionMap = new Map<string, number>()
@@ -68,9 +115,15 @@ export async function prepareRepoData(
             }
             const isCodeFile_ = isCodeFile(file.relativeFilePath)
             const isDevFile = file.relativeFilePath === 'devfile.yaml'
-            // When useAutoBuildFeature is on, only respect the gitignore rules filtered earlier and apply the size limit, otherwise, exclude all non code files and gitignore files
-            const isNonCodeFileAndIgnored = useAutoBuildFeature ? false : !isCodeFile_ || isDevFile
-            if (fileSize >= maxFileSizeBytes || isNonCodeFileAndIgnored) {
+            const isInfraDiagramFileExt = isInfraDiagramFile(file.relativeFilePath)
+
+            let isExcludeFile = fileSize >= maxFileSizeBytes
+            // When useAutoBuildFeature is on, only respect the gitignore rules filtered earlier and apply the size limit
+            if (!isExcludeFile && !useAutoBuildFeature) {
+                isExcludeFile = isDevFile || (!isCodeFile_ && (!isIncludeInfraDiagram || !isInfraDiagramFileExt))
+            }
+
+            if (isExcludeFile) {
                 if (!isCodeFile_) {
                     const re = /(?:\.([^.]+))?$/
                     const extensionArray = re.exec(file.relativeFilePath)
@@ -83,6 +136,7 @@ export async function prepareRepoData(
                 }
                 continue
             }
+
             totalBytes += fileSize
             // Paths in zip should be POSIX compliant regardless of OS
             // Reference: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
@@ -117,7 +171,10 @@ export async function prepareRepoData(
             }
         }
 
-        telemetry.setRepositorySize(totalBytes)
+        if (telemetry) {
+            telemetry.setRepositorySize(totalBytes)
+        }
+
         span.record({ amazonqRepositorySize: totalBytes })
         const zipResult = await zip.finalize()