merge in upstream changes

Author: Hweinstock

.eslintrc.js

@@ -206,6 +206,11 @@ module.exports = {
                         message:
                             'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.',
                     },
+                    {
+                        name: '..',
+                        message:
+                            'Avoid importing from index.ts files as it can lead to circular dependencies. Import from the module directly instead.',
+                    },
                 ],
             },
         ],

.github/workflows/filterDuplicates.js

@@ -4,7 +4,7 @@
  * the program exits with an error and logs the filtered report to console.
  *
  * Usage:
- *      node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report]
+ *      node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report] [commit_hash] [repo_name]
  *
  * Tests:
  *      node filterDuplicates.js test
@@ -84,25 +84,40 @@ function filterDuplicates(report, changes) {
     return duplicates
 }
 
+function formatDuplicates(duplicates, commitHash, repoName) {
+    const baseUrl = `https://github.com/${repoName}`
+    return duplicates.map((dupe) => {
+        return {
+            first: formUrl(dupe.firstFile, commitHash),
+            second: formUrl(dupe.secondFile, commitHash),
+            numberOfLines: dupe.lines,
+        }
+    })
+    function formUrl(file, commitHash) {
+        return `${baseUrl}/blob/${commitHash}/${file.name}#L${file.start}-L${file.end}`
+    }
+}
+
 async function run() {
     const rawDiffPath = process.argv[3]
     const jscpdReportPath = process.argv[4]
+    const commitHash = process.argv[5]
+    const repoName = process.argv[6]
     const changes = await parseDiff(rawDiffPath)
     const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8'))
     const filteredDuplicates = filterDuplicates(jscpdReport, changes)
 
     console.log('%s files changes', changes.size)
     console.log('%s duplicates found', filteredDuplicates.length)
     if (filteredDuplicates.length > 0) {
-        console.log(filteredDuplicates)
+        console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
         process.exit(1)
     }
 }
 
 /**
  * Mini-test Suite
  */
-console.log(__dirname)
 const testDiffFile = path.resolve(__dirname, 'test/test_diff.txt')
 let testCounter = 0
 function assertEqual(actual, expected) {

.github/workflows/node.js.yml

@@ -101,7 +101,10 @@ jobs:
                   path: ./jscpd-report.json
 
             - name: Check for Duplicates
-              run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json
+              env:
+                  COMMIT_HASH: ${{ github.sha}}
+                  REPO_NAME: ${{ github.repository }}
+              run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json $COMMIT_HASH $REPO_NAME
 
     macos:
         needs: lint-commits

packages/amazonq/test/e2e/amazonq/doc.test.ts

@@ -108,6 +108,43 @@ describe('Amazon Q Doc', async function () {
                 FollowUpTypes.MakeChanges,
                 FollowUpTypes.RejectChanges,
             ])
+
+            tab.clickButton(FollowUpTypes.AcceptChanges)
+
+            await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession])
+        })
+    })
+
+    describe('Edits a README', () => {
+        beforeEach(async function () {
+            tab.addChatMessage({ command: '/doc' })
+            await tab.waitForChatFinishesLoading()
+        })
+
+        it('Make specific change in README', async () => {
+            await tab.waitForButtons([FollowUpTypes.UpdateDocumentation])
+
+            tab.clickButton(FollowUpTypes.UpdateDocumentation)
+
+            await tab.waitForButtons([FollowUpTypes.SynchronizeDocumentation, FollowUpTypes.EditDocumentation])
+
+            tab.clickButton(FollowUpTypes.EditDocumentation)
+
+            await tab.waitForButtons([FollowUpTypes.ProceedFolderSelection])
+
+            tab.clickButton(FollowUpTypes.ProceedFolderSelection)
+
+            tab.addChatMessage({ prompt: 'remove the repository structure section' })
+
+            await tab.waitForText(
+                `${i18n('AWS.amazonq.doc.answer.readmeUpdated')} ${i18n('AWS.amazonq.doc.answer.codeResult')}`
+            )
+
+            await tab.waitForButtons([
+                FollowUpTypes.AcceptChanges,
+                FollowUpTypes.MakeChanges,
+                FollowUpTypes.RejectChanges,
+            ])
         })
     })
 })

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

@@ -15,7 +15,7 @@ import {
     throwIfCancelled,
 } from '../service/testGenHandler'
 import path from 'path'
-import { testGenState } from '..'
+import { testGenState } from '../models/model'
 import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 import { ChildProcess, spawn } from 'child_process' // eslint-disable-line no-restricted-imports
 import { BuildStatus } from '../../amazonqTest/chat/session/session'

packages/core/src/codewhisperer/service/testGenHandler.ts

@@ -16,7 +16,7 @@ import CodeWhispererUserClient, {
 import { CreateUploadUrlError, InvalidSourceZipError, TestGenFailedError, TestGenTimedOutError } from '../models/errors'
 import { getMd5, uploadArtifactToS3 } from './securityScanHandler'
 import { fs, randomUUID, sleep, tempDirPath } from '../../shared'
-import { ShortAnswer, TestGenerationJobStatus, testGenState } from '..'
+import { ShortAnswer, testGenState } from '../models/model'
 import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient'
 import { downloadExportResultArchive } from '../../shared/utilities/download'
@@ -182,9 +182,9 @@ export async function pollTestJobStatus(
             }
             ChatSessionManager.Instance.getSession().shortAnswer = shortAnswer
         }
-        if (resp.testGenerationJob?.status !== TestGenerationJobStatus.IN_PROGRESS) {
+        if (resp.testGenerationJob?.status !== CodeWhispererConstants.TestGenerationJobStatus.IN_PROGRESS) {
             // This can be FAILED or COMPLETED
-            status = resp.testGenerationJob?.status as TestGenerationJobStatus
+            status = resp.testGenerationJob?.status as CodeWhispererConstants.TestGenerationJobStatus
             logger.verbose(`testgen job status: ${status}`)
             logger.verbose(`Complete polling test job status.`)
             break

packages/core/src/shared/env/resolveEnv.ts

@@ -10,7 +10,7 @@
 
 import * as crypto from 'crypto'
 import { DevSettings } from '../settings'
-import { getLogger } from '..'
+import { getLogger } from '../logger/logger'
 import { ToolkitError } from '../errors'
 import { userInfo } from 'os'
 import path from 'path'

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

@@ -8,7 +8,7 @@ import AdmZip from 'adm-zip'
 import { getLogger } from '../logger/logger'
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { ToolkitError } from '..'
+import { ToolkitError } from '../errors'
 
 // Get pattern code and save it in temporary folder
 async function fetchUrl(owner: string, repoName: string, assetName: string): Promise<Buffer> {

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import globals from '../extensionGlobals'
+import globals from '../../shared/extensionGlobals'
 
 /**
  * A useful abstraction that does the following: