Merge branch 'master' of https://github.com/aws/aws-toolkit-vscode into restructure3

Author: hayemaxi

.changes/2.8.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2024-02-01",
+	"version": "2.8.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Improve CodePercentage telemetry reporting"
+		}
+	]
+}

.changes/next-release/Bug Fix-58f92b8d-fe98-4885-b150-3c52d640b4a0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Cloud9: certain filesystem calls did not work in Cloud9"
+}

.changes/next-release/Bug Fix-bcc441fe-f0d3-444f-bbcb-16cc634e8a5f.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "EC2 Credentials: Use IMDSv2 calls if available, otherwise fall back IMDSv1."
+}

.changes/next-release/Feature-d14983e3-ed88-4623-bf62-5b78af07aa73.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Enable java 17 for SAM create and local Lambda debugging"
+}

.eslintrc.js

@@ -2,14 +2,17 @@ module.exports = {
     root: true,
     parser: '@typescript-eslint/parser',
     parserOptions: {
+        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', 'aws-toolkits'],
+    plugins: ['@typescript-eslint', 'unicorn', 'header', 'aws-toolkits'],
     extends: [
         'eslint:recommended',
         'plugin:@typescript-eslint/eslint-recommended',
@@ -90,7 +93,6 @@ module.exports = {
         '@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',
         '@typescript-eslint/no-unused-vars': 'off',
         '@typescript-eslint/no-floating-promises': 'error', // Promises must catch errors or be awaited.
@@ -105,6 +107,39 @@ module.exports = {
         // Do not check loops so while(true) works. Potentially reevalute this.
         'no-constant-condition': ['error', { checkLoops: false }],
         'no-empty': 'off',
+
+        // 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',
+
         'header/header': [
             'error',
             'block',

.github/dependabot.yml

@@ -20,6 +20,10 @@ updates:
           vscode-lsp:
               patterns:
                   - 'vscode-lang*'
+          smithy:
+              patterns:
+                  - '@smithy*'
+                  - 'smithy*'
     - package-ecosystem: 'github-actions'
       directory: './packages/toolkit/'
       target-branch: 'master' # Avoid updates to "staging".

.gitignore

@@ -51,5 +51,5 @@ packages/toolkit/resources/css/icons.css
 .local.env
 *.config.local.json
 
-# Created by `npm run runInBrowser` when testing extension in the browser
+# Created by `npm run browserRun` when testing extension in the browser
 .vscode-test-web

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.8.0 2024-02-01
+
+- **Bug Fix** CodeWhisperer: Improve CodePercentage telemetry reporting
+
 ## 2.7.0 2024-01-25
 
 - **Bug Fix** Add invalid auth handling to Application Composer's Sync button

CONTRIBUTING.md

@@ -189,6 +189,21 @@ To run a single test in VSCode, do any one of:
     rootTestsPath: __dirname + '/shared/sam/debugger/'
     ```
 
+#### Run all tests in a specific folder
+
+To run tests against a specific folder in VSCode, do any one of:
+
+-   Add the TEST_DIR environment variable to one of the testing launch configs and run it
+-   Run in your terminal
+    -   Unix/macOS/POSIX shell:
+        ```
+        TEST_DIR=src/test/foo npm run test
+        ```
+    -   Powershell:
+        ```
+        $Env:TEST_DIR = "src/test/foo"; npm run test
+        ```
+
 ### Browser Support
 
 Running the extension in the browser (eg: [vscode.dev](https://vscode.dev/)).
@@ -329,7 +344,7 @@ Example:
 }
 ```
 
-Overrides specifically for CodeCatalyst can be set using the `aws.dev.codecatalystService` setting. This is a JSON object consisting of keys/values required to override API calls to CodeCatalyst: `region`, `endpoint`, `hostname`, and `gitHostname`. If this setting is present, then all keys need to be explicitly provided.
+<a name="codecatalyst-settings">Overrides specifically for CodeCatalyst can be set using the `aws.dev.codecatalystService` setting. This is a JSON object consisting of keys/values required to override API calls to CodeCatalyst: `region`, `endpoint`, `hostname`, and `gitHostname`. If this setting is present, then all keys need to be explicitly provided.</a>
 
 Example:
 
@@ -342,6 +357,85 @@ Example:
 }
 ```
 
+<a name="codewhisperer-settings">Overrides specifically for CodeWhisperer/Amazon Q can be set using the `aws.dev.codewhispererService` setting. This is a JSON object consisting of keys/values required to override API calls to CodeWhisperer/Amazon Q: `region` and `endpoint`. If this setting is present, then all keys need to be explicitly provided.</a>
+
+Example:
+
+```json
+"aws.dev.codewhispererService": {
+    "region": "us-west-2",
+    "endpoint": "https://codewhisperer-gamma.example.com"
+}
+```
+
+### Environment variables
+
+Environment variables can be used to modify the behaviour of VSCode. The following are environment variables that can be used to configure the extension:
+
+#### General AWS
+
+-   `AWS_ACCESS_KEY_ID`: The AWS access key associated with an IAM account. If defined, this environment variable overrides the value for the profile setting aws_access_key_id. For more information see [environment variables to configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+-   `AWS_SECRET_ACCESS_KEY`: The secret key associated with the access key. This is essentially the "password" for the access key. If defined, this environment variable overrides the value for the profile setting aws_secret_access_key. For more information see [environment variables to configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+-   `AWS_REGION`: The AWS Region to send the request to. If defined, this environment variable overrides the values in the environment variable AWS_DEFAULT_REGION and the profile setting region. For more information see [environment variables to configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+-   `AWS_SDK_LOAD_CONFIG`: Controls how the AWS SDK for javascript loads it's configuration when initialized. If the AWS_SDK_LOAD_CONFIG environment variable has been set to a truthy value, the SDK for JavaScript automatically searches for a config file when it loads. For more information see [the shared config file documentation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-region.html#setting-region-config-file)
+-   `AWS_SHARED_CREDENTIALS_FILE`: The location of the file that the AWS CLI uses to store access keys. The default path is `~/.aws/credentials`
+-   `AWS_CONFIG_FILE`: The location of the file that the AWS CLI uses to store configuration profiles. The default path is `~/.aws/config`
+
+#### General OS
+
+-   `HOME`: The home directory location for the current user in Linux and other Unix-like operating systems.
+-   `SSH_AUTH_SOCK`: The location of a UNIX domain socket used by ssh-agent and SSH clients for agent-based authentication
+-   `USERPROFILE`: The absolute path to the profile folder for the current user in Windows
+-   `HOMEPATH`: The path to the home directory for the current user in Windows, without including the drive letter
+-   `PROGRAMFILES/PROGRAMFILES(X86)`: The default installation directory for Windows
+-   `WINDIR`: The location of the Windows installation directory
+-   `PATH`: The set of directories where executable programs live
+
+#### Codecatalyst
+
+-   `__DEV_ENVIRONMENT_ID`: The ID of the running development environment. Automatically set when running the toolkit in Codecatalyst
+-   `__DEV_ENVIRONMENT_PROJECT_NAME`: The project name associated with the running development environment. Automatically set when running the toolkit in Codecatalyst
+-   `__DEV_ENVIRONMENT_SPACE_NAME`: The space name associated with the running development environment. Automatically set when running the toolkit in Codecatalyst
+-   `__DEV_ENVIRONMENT_ORGANIZATION_NAME`: The organization name associated with the running development environment. Automatically set when running the toolkit in Codecatalyst
+
+The following are environment variable versions of the user `settings.json` overrides mentioned [here](#codecatalyst-settings). These will always override the toolkit defaults and those defined in `settings.json`.
+Unlike the user setting overrides, not all of these environment variables have to be set to make use of them.
+
+-   `__CODECATALYST_REGION`: for aws.dev.codecatalystService.region
+-   `__CODECATALYST_ENDPOINT`: for aws.dev.codecatalystService.endpoint
+-   `__CODECATALYST_HOSTNAME`: for aws.dev.codecatalystService.hostname
+-   `__CODECATALYST_GIT_HOSTNAME`: for aws.dev.codecatalystService.gitHostname
+
+#### Codewhisperer/Amazon Q
+
+The following are environment variable versions of the user `settings.json` overrides mentioned [here](#codewhisperer-settings). These will always override the toolkit defaults and those defined in `settings.json`.
+Unlike the user setting overrides, not all of these environment variables have to be set to make use of them.
+
+-   `__CODEWHISPERER_REGION`: for aws.dev.codewhispererService.region
+-   `__CODEWHISPERER_ENDPOINT`: for aws.dev.codewhispererService.endpoint
+
+#### Lambda
+
+-   `AUTH_UTIL_LAMBDA_ARN`: The Amazon Resource Name (ARN) of the lambda function
+
+#### ECS
+
+-   `AWS_CONTAINER_CREDENTIALS_RELATIVE_URI`: The relative HTTP URL endpoint for the SDK to use when making a request for credentials. The value is appended to the default Amazon ECS hostname of 169.254.170.2. For more information see [container credential provider](https://docs.aws.amazon.com/sdkref/latest/guide/feature-container-credentials.html)
+-   `AWS_CONTAINER_CREDENTIALS_FULL_URI`: The full HTTP URL endpoint for the SDK to use when making a request for credentials. This includes both the scheme and the host. For more information see [container credential provider](https://docs.aws.amazon.com/sdkref/latest/guide/feature-container-credentials.html)
+
+#### Step functions
+
+-   `SSMDOCUMENT_LANGUAGESERVER_PORT`: The port the ssm document language server should start debugging on
+
+#### CI/Testing
+
+-   `GITHUB_ACTION`: The name of the current GitHub Action workflow step that is running
+-   `CODEBUILD_BUILD_ID`: The unique ID of the current CodeBuild build that is executing
+-   `AWS_TOOLKIT_AUTOMATION`: If tests are currently being ran
+-   `DEVELOPMENT_PATH`: The path to the aws toolkit vscode project
+-   `AWS_TOOLKIT_TEST_NO_COLOR`: If the tests should include colour in their output
+-   `TEST_DIR` - The directory where the test runner should find the tests
+
 ### SAM/CFN ("goformation") JSON schema
 
 See [docs/cfn-schema-support.md](./docs/cfn-schema-support.md) for how to fix