Merge remote-tracking branch 'origin/muaydin/docdb-polling-bug-fix' into muaydin/docdb-polling-bug-fix

Author: Alexey Temnikov

.changes/next-release/Bug Fix-77137e24-593d-4859-a15f-e029edf843a7.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Resource Explorer: S3 tree view now shows bucket contents correctly, even when restricted to root prefix."
+}

.eslintrc.js

@@ -206,8 +206,15 @@ 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.',
+                    },
                 ],
             },
         ],
+
+        'prettier/prettier': ['error', { endOfLine: 'auto' }],
     },
 }

.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

@@ -57,7 +57,7 @@ jobs:
             - run: npm run testCompile
             - run: npm run lint
 
-    jscpd:
+    lint-duplicate-code:
         needs: lint-commits
         if: ${{ github.event_name == 'pull_request'}}
         runs-on: ubuntu-latest
@@ -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

.gitignore

@@ -47,7 +47,6 @@ packages/amazonq/package.nls.json
 packages/amazonq/resources
 
 # Icons
-packages/*/resources/icons/cloud9/generated/**
 packages/*/resources/fonts/aws-toolkit-icons.woff
 packages/*/resources/css/icons.css
 

CONTRIBUTING.md

@@ -633,7 +633,7 @@ If you are contribuing visual assets from other open source repos, the source re
 ## Using new vscode APIs
 
 The minimum required vscode version specified in [package.json](https://github.com/aws/aws-toolkit-vscode/blob/07119655109bb06105a3f53bbcd86b812b32cdbe/package.json#L16)
-is decided by the version of vscode running in Cloud9 and other vscode-compatible targets.
+is decided by the version of vscode running in other supported vscode-compatible targets (e.g. web).
 
 But you can still use the latest vscode APIs, by checking the current running vscode version. For example, to use a vscode 1.64 API:
 

buildspec/release/70checkmarketplace.yml

@@ -0,0 +1,53 @@
+version: 0.2
+
+phases:
+    install:
+        runtime-versions:
+            nodejs: 16
+
+        commands:
+            - apt update
+            - apt install -y wget gpg
+            - curl -sSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+            - install -o root -g root -m 644 packages.microsoft.gpg /etc/apt/trusted.gpg.d/
+            - sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
+            - apt update
+            - apt install -y code
+
+    pre_build:
+        commands:
+            # Check for implicit env vars passed from the release pipeline.
+            - test -n "${TARGET_EXTENSION}"
+
+    build:
+        commands:
+            - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
+            # get extension name, if in beta, use some hard-coded recent version
+            - |
+                if [ "${TARGET_EXTENSION}" = "amazonq" ]; then
+                  extension_name="amazonwebservices.amazon-q-vscode"
+                  [ "$STAGE" != "prod" ] && VERSION="1.43.0" || true
+                elif [ "${TARGET_EXTENSION}" = "toolkit" ]; then
+                  extension_name="amazonwebservices.aws-toolkit-vscode"
+                  [ "$STAGE" != "prod" ] && VERSION="3.42.0" || true
+                else
+                  echo checkmarketplace: "Unknown TARGET_EXTENSION: ${TARGET_EXTENSION}"
+                  exit 1
+                fi
+                if [ "$STAGE" != "prod" ]; then
+                  echo "checkmarketplace: Non-production stage detected. Installing hardcoded version '${VERSION}'."
+                fi
+            # keep installing the desired extension version until successful. Otherwise fail on codebuild timeout (1 hour).
+            - |
+                while true; do
+                  code --uninstall-extension "${extension_name}" --no-sandbox --user-data-dir /tmp/vscode
+                  code --install-extension "${extension_name}@${VERSION}" --no-sandbox --user-data-dir /tmp/vscode || true
+                  cur_version=$(code --list-extensions --show-versions --no-sandbox --user-data-dir /tmp/vscode | grep ${extension_name} | cut -d'@' -f2)
+                  if [ "${cur_version}" = "${VERSION}" ]; then
+                    echo "checkmarketplace: Extension ${extension_name} is updated to version '${cur_version}.'"
+                    break
+                  else
+                    echo "checkmarketplace: Expected extension version '${VERSION}' has not been successfully installed. Retrying..."
+                  fi
+                  sleep 120 # Wait for 2 minutes before retrying
+                done

cloud9-toolkit-install.sh

@@ -81,13 +81,10 @@ that is a net cost.
 -   Telemetry: "active" vs "passive"
     -   Active (`passive:false`) metrics are those intended to appear in DAU count.
 -   Icons:
-    -   Where possible, use IDE-specific standard icons (e.g. standard VSCode
-        standard icons in VSCode, and Cloud9 standard icons in Cloud9). The typical
-        (maintainable) way to do this is to use _named_ icons (what VSCode calls
+    -   Where possible, use standard VSCode icons. The typical (maintainable)
+        way to do this is to use _named_ icons (what VSCode calls
         [codicons](https://microsoft.github.io/vscode-codicons/)) as opposed to
         icons shipped with the Toolkit build and referenced by _path_.
-    -   For cases where icons must be statically defined (package.json), if Cloud9
-        does not support the VSCode standard icon, use the Cloud9 icon.
 -   Changelog guidelines
     -   Prefer active voice: "You can do X" instead of "X can be done"
 -   Avoid unnecessary use of `lodash` (which we may remove in the future).
@@ -240,11 +237,11 @@ _See also [arch_develop.md](./arch_develop.md#exceptions)._
 
     -   PREFER:
         ```ts
-        things.filter(o => o.isFoo)
+        things.filter((o) => o.isFoo)
         ```
     -   INSTEAD OF:
         ```ts
-        things.filter(thing => thing.isFoo)
+        things.filter((thing) => thing.isFoo)
         ```
 
 ## User settings

docs/CODE_GUIDELINES.md

@@ -31,8 +31,6 @@ If you must define a new key (is it _really_ necessary?), follow these guideline
 These keys are currently set by the core/ package, but many of them may eventually be migrated to
 toolkit/ or amazonq/ if appropriate.
 
--   `isCloud9`: This is hardcoded by Cloud9 itself, not the Toolkit.
-    -   Cloud9 _does not support setContext_. So this is the only usable key there.
 -   `aws.codecatalyst.connected`: CodeCatalyst connection is active.
 -   `aws.codewhisperer.connected`: CodeWhisperer connection is active.
 -   `aws.codewhisperer.connectionExpired`: CodeWhisperer connection is active, but the connection is expired.