Merge master into feature/AWSDocuments

.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."
+}

.editorconfig

@@ -8,13 +8,10 @@ end_of_line = lf
 insert_final_newline = true
 indent_size = 4
 indent_style = space
+max_line_length = 100
 
-[*.{js,py}]
+[*.{js,ts,py}]
 charset = utf-8
 
-# 4 space indentation
-[*.py]
-indent_style = space
-
 [Makefile]
 indent_style = tab

.eslintrc.js

@@ -2,20 +2,25 @@ module.exports = {
     root: true,
     parser: '@typescript-eslint/parser',
     parserOptions: {
-        project: './tsconfig.json',
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        project: ['./packages/*/tsconfig.json', './plugins/*/tsconfig.json'],
         tsconfigRootDir: __dirname,
     },
     env: {
         node: true,
         mocha: true,
+        es2024: true,
     },
-    plugins: ['@typescript-eslint', 'header', 'no-null'],
+    plugins: ['@typescript-eslint', '@stylistic', 'unicorn', 'header', 'security-node', 'aws-toolkits'],
     extends: [
         'eslint:recommended',
         'plugin:@typescript-eslint/eslint-recommended',
         'plugin:@typescript-eslint/recommended-requiring-type-checking',
         'plugin:@typescript-eslint/recommended',
-        'prettier',
+        // "Add this as the _last_ item in the extends array, so that eslint-config-prettier has the
+        // opportunity to override other configs." https://github.com/prettier/eslint-plugin-prettier
+        'plugin:prettier/recommended',
     ],
     rules: {
         curly: 2, // Enforce braces on "if"/"for"/etc.
@@ -50,6 +55,8 @@ module.exports = {
                 // modifiers: ['requiresQuotes'],
             },
         ],
+        // Avoid accidental use of "==" instead of "===".
+        eqeqeq: 'error',
         // TODO reenable this rule (by removing this off)
         'no-async-promise-executor': 'off',
         // TODO reenable this rule (by removing this off)
@@ -85,37 +92,130 @@ module.exports = {
         // TODO reenable this rule, tests mostly break this one (by changing off to error)
         // This currently produces 700 non fixable by --fix errors
         'sort-imports': 'off',
-        // TODO rennable this rule (by removing this off)
-        // namespaces are not great and we should stop using them
-        '@typescript-eslint/no-namespace': 'off',
-        // Turn this on by removing off when we fix namespaces
-        'no-inner-declarations': 'off',
+        '@typescript-eslint/no-namespace': 'error',
         // This is off because prettier takes care of it
         'no-extra-semi': 'off',
-        'no-null/no-null': 'error',
         '@typescript-eslint/no-empty-function': 'off',
+        // Disallows returning e.g. Promise<…|never> which signals that an exception may be thrown.
+        // https://stackoverflow.com/q/64230626/152142
+        '@typescript-eslint/no-redundant-type-constituents': 'off',
         '@typescript-eslint/no-unused-vars': 'off',
-        // New rules --> New TODOs
+        '@typescript-eslint/no-floating-promises': 'error', // Promises must catch errors or be awaited.
         '@typescript-eslint/no-var-requires': 'off', // Should be able to remove with the full migration of SDK v3
         '@typescript-eslint/no-unsafe-member-access': 'off', // use typeguard before accessing a member
         '@typescript-eslint/no-unsafe-assignment': 'off', // 112 errors, similar to above
         '@typescript-eslint/no-unsafe-return': 'off', // 26 errors, similar to above
         '@typescript-eslint/no-unsafe-call': 'off', // 24 errors, need types for imported constructors
         '@typescript-eslint/restrict-template-expressions': 'off', // 294 errors, forces template literals to be a certain type
-        '@typescript-eslint/no-floating-promises': 'off', // 274 errors, promises should catch errors or be awaited
         '@typescript-eslint/ban-ts-comment': 'off', // 27 errors, bans compiler error exceptions
         '@typescript-eslint/explicit-module-boundary-types': 'off', // Remove this once 'explicit-function-return-type' is on
         // Do not check loops so while(true) works. Potentially reevalute this.
         'no-constant-condition': ['error', { checkLoops: false }],
         'no-empty': 'off',
+
+        // https://eslint.style/rules/default/spaced-comment
+        // Require space after // comment.
+        '@stylistic/spaced-comment': [
+            'error',
+            'always',
+            {
+                block: {
+                    markers: ['!'], // Allow the /*!…*/ license header.
+                    // exceptions: ['*'],
+                    // balanced: true
+                },
+            },
+        ],
+
+        // Rules from https://github.com/sindresorhus/eslint-plugin-unicorn
+        // TODO: 'unicorn/no-useless-promise-resolve-reject': 'error',
+        // TODO: 'unicorn/prefer-at': 'error',
+        // TODO: 'unicorn/prefer-event-target': 'error',
+        // TODO: 'unicorn/prefer-negative-index': 'error',
+        // TODO: 'unicorn/prefer-string-slice': 'error',
+        // TODO: 'unicorn/prefer-regexp-test': 'error',
+        // TODO: 'unicorn/prefer-ternary': 'error',
+        // TODO(?): 'unicorn/custom-error-definition': 'error',
+        // TODO(?): 'unicorn/prefer-json-parse-buffer': 'error',
+        // TODO: ESM modules https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/prefer-module.md
+        // 'unicorn/prefer-module': 'error',
+        'unicorn/no-abusive-eslint-disable': 'error',
+        'unicorn/no-null': 'error',
+        'unicorn/no-unnecessary-polyfills': 'error',
+        'unicorn/no-useless-spread': 'error',
+        'unicorn/prefer-array-some': 'error',
+        'unicorn/prefer-blob-reading-methods': 'error',
+        'unicorn/prefer-code-point': 'error',
+        'unicorn/prefer-date-now': 'error',
+        'unicorn/prefer-dom-node-text-content': 'error',
+        'unicorn/prefer-includes': 'error',
+        'unicorn/prefer-keyboard-event-key': 'error',
+        'unicorn/prefer-modern-dom-apis': 'error',
+        'unicorn/prefer-modern-math-apis': 'error',
+        'unicorn/prefer-native-coercion-functions': 'error',
+        // 'unicorn/prefer-node-protocol': 'error',
+        // 'unicorn/prefer-object-from-entries': 'error',
+        'unicorn/prefer-reflect-apply': 'error',
+        'unicorn/prefer-string-trim-start-end': 'error',
+        'unicorn/prefer-type-error': 'error',
+        // Discourage `.forEach` because it can lead to accidental, incorrect use of async callbacks.
+        'unicorn/no-array-for-each': 'error',
+        'security-node/detect-child-process': 'error',
+
         'header/header': [
             'error',
             'block',
             {
                 pattern:
-                    'Copyright ([0-9]{4}[-,]{0,1}[ ]{0,1}){1,} Amazon.com, Inc. or its affiliates. All Rights Reserved.\\r?\\n \\* SPDX-License-Identifier: Apache-2.0',
+                    'Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\\r?\\n \\* SPDX-License-Identifier: Apache-2.0',
             },
             { lineEndings: 'unix' },
         ],
+
+        'aws-toolkits/no-only-in-tests': 'error',
+        'aws-toolkits/no-await-on-vscode-msg': 'error',
+        'aws-toolkits/no-banned-usages': 'error',
+        'aws-toolkits/no-incorrect-once-usage': 'error',
+        'aws-toolkits/no-string-exec-for-child-process': 'error',
+        'aws-toolkits/no-console-log': 'error',
+        'aws-toolkits/no-json-stringify-in-log': 'error',
+        'aws-toolkits/no-printf-mismatch': 'error',
+        'aws-toolkits/no-index-import': 'error',
+        'no-restricted-imports': [
+            'error',
+            {
+                patterns: [
+                    {
+                        group: ['**/core/dist/*'],
+                        message:
+                            "Avoid importing from the core lib's dist/ folders; please use directly from the core lib defined exports.",
+                    },
+                ],
+                // The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
+                paths: [
+                    {
+                        name: 'fs-extra',
+                        message:
+                            'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
+                    },
+                    {
+                        name: 'fs',
+                        message: 'Avoid node:fs and use shared/fs/fs.ts when possible.',
+                    },
+                    {
+                        name: 'child_process',
+                        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/CODEOWNERS

@@ -1,2 +1,4 @@
 * @aws/aws-ides-team
-src/codewhisperer/ @aws/codewhisperer-team
+packages/core/src/codewhisperer/ @aws/codewhisperer-team
+packages/core/src/amazonqFeatureDev/ @aws/earlybird
+packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer

.github/ISSUE_TEMPLATE/bug_report.md

@@ -16,8 +16,9 @@ labels: bug
 
 ## Expected behavior
 
-## System details (run the `AWS: About Toolkit` command)
+## System details (run `AWS: About` and/or `Amazon Q: About`)
 
 -   OS:
 -   Visual Studio Code version:
 -   AWS Toolkit version:
+-   Amazon Q version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for AWS Toolkit
+about: Suggest an idea for AWS Toolkit or Amazon Q
 labels: feature-request
 ---
 

.github/ISSUE_TEMPLATE/guidance_request.md

@@ -4,11 +4,12 @@ about: Ask for guidance, "how to", or other questions
 labels: guidance
 ---
 
-## System details (run the `AWS: About Toolkit` command)
+## System details (run `AWS: About` and/or `Amazon Q: About`)
 
 -   OS:
 -   Visual Studio Code version:
 -   AWS Toolkit version:
+-   Amazon Q version:
 
 ## Question
 

.github/ISSUE_TEMPLATE/unreliable_test_report.md

@@ -0,0 +1,17 @@
+---
+name: unreliable test
+about: Help us monitor our test suite by reporting flaky tests.
+labels: tests-ci-cd
+---
+
+## Test Details
+
+-   Name of test:
+-   OS of failure:
+-   VSCode version of failure (minimum/insider/stable):
+-   Link to failing run:
+-   Link to failing test:
+
+## Log of Test Failure
+
+## Additional Information

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,11 @@
 ## Problem
 
+
 ## Solution
 
-<!---
-    REMINDER:
-    - Read CONTRIBUTING.md first.
-    - Add test coverage for your changes.
-    - Update the changelog using `npm run newChange`.
-    - Link to related issues/commits.
-    - Testing: how did you test your changes?
-    - Screenshots
--->
 
-## License
+---
 
-By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
+- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
+- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
+- License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/dependabot.yml

@@ -1,10 +1,45 @@
 # Documentation for configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+#
+# Troubleshooting: Insights tab > Dependency Graph > Dependabot
+# https://github.com/aws/aws-toolkit-vscode/network/updates
 
 version: 2
 updates:
     - package-ecosystem: 'npm'
-      directory: '/' # Location of package manifests.
+      directory: './src.gen'
+      target-branch: 'master'
+      schedule:
+          interval: 'monthly'
+      ignore:
+          - dependency-name: '*' # roundabout way to ignore this entire directory, see https://github.com/dependabot/dependabot-core/issues/4364#issuecomment-2002406602
+    - package-ecosystem: 'npm'
+      directory: './' # Location of package manifests.
+      target-branch: 'master' # Avoid updates to "staging".
+      versioning-strategy: 'increase'
+      commit-message:
+          prefix: 'deps'
+      schedule:
+          interval: 'daily'
+      groups:
+          aws-sdk:
+              patterns:
+                  - '@aws-sdk/*'
+          vscode-lsp:
+              patterns:
+                  - 'vscode-lang*'
+          smithy:
+              patterns:
+                  - '@smithy*'
+                  - 'smithy*'
+    - package-ecosystem: 'github-actions'
+      directory: './'
       target-branch: 'master' # Avoid updates to "staging".
+      commit-message:
+          prefix: 'deps'
       schedule:
           interval: 'daily'
+      groups:
+          github-actions:
+              patterns:
+                  - '*'