Merge branch 'aws:master' into feature/rubysecurityscans

Author: laileni-aws

.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/Breaking Change-d11aa2b2-96e2-46f7-9a06-5fceab6299ec.json

@@ -1,3 +1,11 @@
+## 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

.changes/next-release/Bug Fix-546034a4-7a26-4c29-b0ae-5f2ddb7b9697.json

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit - Amazon Q, CodeWhisperer, and more",
     "description": "Including Amazon Q, CodeWhisperer, CodeCatalyst, Application Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services",
-    "version": "2.2.0-SNAPSHOT",
+    "version": "2.3.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -4262,7 +4262,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.167",
+        "@aws-toolkits/telemetry": "^1.0.169",
         "@aws/fully-qualified-names": "^2.1.1",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",

.changes/next-release/Bug Fix-5caa0d38-8b96-437c-9710-3b288794d9ab.json

@@ -7,12 +7,7 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 import { Commands, placeholder } from '../../shared/vscode/commands2'
 import { getIcon } from '../../shared/icons'
-import {
-    focusAmazonQPanel,
-    reconnect,
-    showTransformByQ,
-    transformTreeNode,
-} from '../../codewhisperer/commands/basicCommands'
+import { focusAmazonQPanel, reconnect, showTransformByQ } from '../../codewhisperer/commands/basicCommands'
 import { transformByQState } from '../../codewhisperer/models/model'
 import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
 import { amazonQHelpUrl } from '../../shared/constants'
@@ -66,7 +61,7 @@ export const createTransformByQ = () => {
     if (transformByQState.isRunning()) {
         vscode.commands.executeCommand('setContext', 'gumby.isTransformAvailable', false)
         if (status === '') {
-            // job is running but polling has not started yet, so display generic messsage
+            // job is running but polling has not started yet, so display generic message
             status = CodeWhispererConstants.transformByQStateRunningMessage
         }
     } else if (transformByQState.isCancelled()) {
@@ -80,7 +75,7 @@ export const createTransformByQ = () => {
     } else if (transformByQState.isNotStarted()) {
         status = ''
     }
-    return showTransformByQ.build(transformTreeNode).asTreeNode({
+    return showTransformByQ.build(CodeWhispererConstants.transformTreeNode).asTreeNode({
         label: status !== '' ? `${prefix} Transform [Job status: ` + status + `]` : `Transform`,
         iconPath: transformByQState.getIconForButton(),
         tooltip: `${prefix} Transform`,