Merge branch 'aws:master' into feature/securityscans

Author: laileni-aws

.changes/next-release/Bug Fix-402cf60e-4ce2-4886-9133-b77af3b6f42b.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Help > View Toolkit Logs opens an empty file if other menu items were interacted with first."
+}

.changes/next-release/Bug Fix-c2517750-f693-42cd-a003-f04f61cd9f9d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: Fixed an issue where sometimes /transform won't appear when switching between idC/builder id"
+}

.changes/next-release/Bug Fix-c3b1288b-9bb9-41a8-910e-44bd160631a4.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: 'Switch to Q Chat' button not working for some users."
+}

.eslintrc.js

@@ -9,7 +9,7 @@ module.exports = {
         node: true,
         mocha: true,
     },
-    plugins: ['@typescript-eslint', 'header', 'no-null'],
+    plugins: ['@typescript-eslint', 'header', 'no-null', 'aws-toolkits'],
     extends: [
         'eslint:recommended',
         'plugin:@typescript-eslint/eslint-recommended',
@@ -115,5 +115,6 @@ module.exports = {
             },
             { lineEndings: 'unix' },
         ],
+        'aws-toolkits/no-only-in-tests': 'error',
     },
 }

.prettierignore

@@ -9,3 +9,4 @@ src/testFixtures/**
 dist/**
 types/*.d.ts
 src.gen/**
+plugins/*/dist/**

CONTRIBUTING.md

@@ -335,6 +335,15 @@ See [docs/cfn-schema-support.md](./docs/cfn-schema-support.md) for how to fix
 and improve the JSON schema that provides auto-completion and syntax checking
 of SAM and CloudFormation `template.yaml` files.
 
+### Custom Lint Rules
+
+The package.json 'devDependencies' includes `eslint-plugin-aws-toolkits`. This is a local eslint plugin where we define custom lint rules. Additional lint rules and tests for lint rules can be added to this plugin:
+
+1. Define a new rule in `plugins/eslint-plugin-aws-toolkits/lib/rules`.
+2. Create a test for your rule in `plugins/eslint-plugin-aws-toolkits/test/rules` and run with `npm run test` in the root directory of `eslint-plugin-aws-toolkits`.
+3. Register your rule in `plugins/eslint-plugin-aws-toolkits/index.ts`.
+4. Enable your rule in `.eslintrc`.
+
 ### AWS SDK generator
 
 When the AWS SDK does not (yet) support a service but you have an API

docs/TESTPLAN.md

@@ -81,6 +81,7 @@ modifications/workarounds in `src/test/testRunner.ts`.
 -   Testing AWS SDK client functionality is cumbersome, verbose, and low-yield.
 -   Test code uses multiple “mocking” frameworks, which is confusing, error-prone, hard to onboard, and hard to use.
 -   Coverage not counted for integ tests (because of unresolved tooling issue).
+-   [Backlog](https://github.com/aws/aws-toolkit-vscode/blob/0f3685ab0dc8af3a214136ebfa233829d5d72b2c/src/shared/telemetry/exemptMetrics.ts) of metrics that do not pass validation but are temporarily exempted to not fail CI.
 
 ## Window
 

package-lock.json

@@ -4238,15 +4238,16 @@
         "runInBrowser": "npm run buildBrowser && npx @vscode/test-web --open-devtools --extensionDevelopmentPath=. .",
         "compile": "npm run clean && npm run buildScripts && webpack --mode development && npm run copyFiles",
         "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
-        "postinstall": "npm run generateTelemetry && npm run generateConfigurationAttributes",
+        "postinstall": "npm run generateTelemetry && npm run generateConfigurationAttributes && npm run buildCustomLintPlugin",
         "testCompile": "npm run buildScripts && tsc -p ./ && npm run instrument",
         "test": "npm run testCompile && ts-node ./scripts/test/test.ts && npm run report",
         "testE2E": "npm run testCompile && ts-node ./scripts/test/testE2E.ts && npm run report",
         "testInteg": "npm run testCompile && ts-node ./scripts/test/testInteg.ts && npm run report",
         "lint": "ts-node ./scripts/lint/testLint.ts && npm run format",
         "lintfix": "eslint -c .eslintrc.js --fix --ext .ts . && npm run formatfix",
-        "format": "prettier --check src",
-        "formatfix": "prettier --write src",
+        "buildCustomLintPlugin": "cd ./plugins/eslint-plugin-aws-toolkits && npm run build",
+        "format": "prettier --check src plugins",
+        "formatfix": "prettier --write src plugins",
         "package": "ts-node ./scripts/build/package.ts",
         "install-plugin": "vsce package -o aws-toolkit-vscode-test.vsix && code --install-extension aws-toolkit-vscode-test.vsix",
         "generateClients": "npm run build -w @amzn/codewhisperer-streaming && ts-node ./scripts/build/generateServiceClient.ts ",
@@ -4311,6 +4312,7 @@
         "eslint-config-prettier": "8.8",
         "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-no-null": "^1.0.2",
+        "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
         "file-loader": "^6.2.0",
         "glob": "^7.1.7",
         "husky": "^7.0.2",
@@ -4397,7 +4399,6 @@
         "winston": "^3.7.1",
         "winston-transport": "^4.5.0",
         "xml2js": "^0.6.0",
-        "yaml": "^1.9.2",
         "yaml-cfn": "^0.3.2"
     },
     "prettier": {

package.json

@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import NoOnlyInTests from './lib/rules/no-only-in-tests'
+
+const rules = {
+    'no-only-in-tests': NoOnlyInTests,
+}
+
+export { rules }