Merge branch 'aws:master' into master

Author: laileni-aws

.changes/2.1.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2023-11-30",
+	"version": "2.1.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Use MDE endpoint set by environment variable"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Application Composer is now available from the AWS Toolkit for Visual Studio Code. Visualize and design AWS CloudFormation and AWS SAM applications from your local machine. Use integrations with featured services such as Amazon CodeWhisperer, AWS Step Functions, and AWS SAM to improve your development experience."
+		}
+	]
+}

.changes/2.2.0.json

@@ -0,0 +1,26 @@
+{
+	"date": "2023-12-06",
+	"version": "2.2.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "validate that pom.xml is in root directory of project, not anywhere in project"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "AWS Toolkit submenus appear in other extension views #4111"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: \"No handler found\" error may occur when opening `vscode://` URI #4105"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Security scans for Java no longer require build artifacts"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Input prompt gets wrapped to new line which avoids focusing"
+		}
+	]
+}

.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',
     },
 }

.github/workflows/release.yml

@@ -69,7 +69,7 @@ jobs:
                   echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
                   echo "version=$(grep -m 1 version package.json | grep -o '[0-9][^\"]\+' | sed 's/-SNAPSHOT//')" >> $GITHUB_OUTPUT
                   echo 'changes<<EOF' >> $GITHUB_OUTPUT
-                  head -14 CHANGELOG.md >> $GITHUB_OUTPUT
+                  cat CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 2' >> $GITHUB_OUTPUT
                   echo 'EOF' >> $GITHUB_OUTPUT
 
     publish:
@@ -83,6 +83,9 @@ jobs:
             FEAT_NAME: ${{ needs.package.outputs.feature }}
             TAG_NAME: ${{ needs.package.outputs.tagname }}
             AWS_TOOLKIT_VERSION: ${{ needs.package.outputs.version }}
+            # Used in release_notes.md
+            BRANCH: ${{ github.ref_name }}
+            # Used in release_notes.md
             AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.changes }}
         permissions:
             contents: write

.github/workflows/release_notes.md

@@ -1,4 +1,4 @@
-_This is an **unsupported preview build** of AWS Toolkit, for testing new features._
+_This is an **unsupported preview build** of the `${BRANCH}` branch of AWS Toolkit._
 
 # Install
 
@@ -8,3 +8,7 @@ _This is an **unsupported preview build** of AWS Toolkit, for testing new featur
 # Changes
 
 ${AWS_TOOLKIT_CHANGES}
+
+## Previous changes
+
+-   See [CHANGELOG.md](CHANGELOG.md)

.prettierignore

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

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.2.0 2023-12-06
+
+- **Breaking Change** validate that pom.xml is in root directory of project, not anywhere in project
+- **Bug Fix** AWS Toolkit submenus appear in other extension views #4111
+- **Bug Fix** CodeCatalyst: "No handler found" error may occur when opening `vscode://` URI #4105
+- **Bug Fix** CodeWhisperer: Security scans for Java no longer require build artifacts
+- **Bug Fix** Amazon Q: Input prompt gets wrapped to new line which avoids focusing
+
+## 2.1.0 2023-11-30
+
+- **Feature** Use MDE endpoint set by environment variable
+- **Feature** AWS Application Composer is now available from the AWS Toolkit for Visual Studio Code. Visualize and design AWS CloudFormation and AWS SAM applications from your local machine. Use integrations with featured services such as Amazon CodeWhisperer, AWS Step Functions, and AWS SAM to improve your development experience.
+
 ## 2.0.0 2023-11-28
 
 - **Bug Fix** CodeWhisperer status bar showing even when not in use