Merge branch 'master' into feature/securityscans

Author: laileni-aws

.changes/next-release/Breaking Change-d11aa2b2-96e2-46f7-9a06-5fceab6299ec.json

@@ -0,0 +1,4 @@
+{
+	"type": "Breaking Change",
+	"description": "validate that pom.xml is in root directory of project, not anywhere in project"
+}

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

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "AWS Toolkit submenus appear in other extension views #4111"
+}

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

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "CodeCatalyst: \"No handler found\" error may occur when opening `vscode://` URI #4105"
+}

.changes/next-release/Bug Fix-d086954c-0bde-4ab8-9d07-7eac324faaf8.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "CodeWhisperer: Security scans for Java no longer require build artifacts"
+}

.changes/next-release/Bug Fix-dc5d5825-4d0e-4a2e-9ec3-63b4a0466662.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: Input prompt gets wrapped to new line which avoids focusing"
+}

package-lock.json

@@ -41,6 +41,7 @@
     "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
     "activationEvents": [
         "onStartupFinished",
+        "onUri",
         "onDebugResolve:aws-sam",
         "onView:aws.codeWhisperer.securityPanel",
         "onDebugInitialConfigurations",
@@ -1407,12 +1408,12 @@
                 },
                 {
                     "submenu": "aws.submenu.feedback",
-                    "when": "view != aws.AmazonQChatView",
+                    "when": "view =~ /^aws\\./ && view != aws.AmazonQChatView",
                     "group": "y_toolkitMeta@1"
                 },
                 {
                     "submenu": "aws.submenu.help",
-                    "when": "view != aws.AmazonQChatView",
+                    "when": "view =~ /^aws\\./ && view != aws.AmazonQChatView",
                     "group": "y_toolkitMeta@2"
                 },
                 {
@@ -4261,7 +4262,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.168",
+        "@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",
@@ -4352,7 +4353,7 @@
         "@aws-sdk/shared-ini-file-loader": "^3.46.0",
         "@aws-sdk/smithy-client": "^3.46.0",
         "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui-chat": "npm:@aws/[email protected].9",
+        "@aws/mynah-ui-chat": "npm:@aws/[email protected].10",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@vscode/debugprotocol": "^1.57.0",

package.json

@@ -6,9 +6,9 @@
 //
 // Creates an artifact that can be given to users for testing alpha/beta builds:
 //
-//     aws-toolkit-vscode-99.0.0-xxxxxxxxxxxx.vsix
+//     aws-toolkit-vscode-99.0.0-xxxxxxx.vsix
 //
-// Where `xxxxxxxxxxxx` is the first 12 characters of the commit hash that produced the artifact
+// Where `xxxxxxx` is the first 7 characters of the commit hash that produced the artifact.
 //
 // The script works like this:
 // 1. temporarily change `version` in package.json
@@ -90,15 +90,15 @@ function isBeta(): boolean {
  *
  * @returns version-string suffix, for example: "-e6ecd84685a9"
  */
-function getVersionSuffix(feature: string): string {
+function getVersionSuffix(feature: string, debug: boolean): string {
     if (isRelease()) {
         return ''
     }
-    const commitId = child_process.execSync('git rev-parse --short=12 HEAD').toString().trim()
-    if (!commitId) {
-        return ''
-    }
-    return `${feature === '' ? '' : `-${feature}`}-${commitId}`
+    const debugSuffix = debug ? '-debug' : ''
+    const featureSuffix = feature === '' ? '' : `-${feature}`
+    const commitId = child_process.execSync('git rev-parse --short=7 HEAD').toString().trim()
+    const commitSuffix = commitId ? `-${commitId}` : ''
+    return `${debugSuffix}${featureSuffix}${commitSuffix}`
 }
 
 function main() {
@@ -118,12 +118,11 @@ function main() {
             fs.copyFileSync(webpackConfigJsFile, `${webpackConfigJsFile}.bk`)
 
             const packageJson: typeof PackageJson = JSON.parse(fs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
-            const versionSuffix = getVersionSuffix(args.feature)
+            const versionSuffix = getVersionSuffix(args.feature, args.debug)
             const version = packageJson.version
-            // Setting the version to an arbitrarily high number stops VSC from auto-updating the beta extension
-            const betaOrDebugVersion = `99.0.0${versionSuffix}`
-            if (isBeta() || args.debug) {
-                packageJson.version = betaOrDebugVersion
+            if (isBeta()) {
+                // Declare an arbitrarily high version number, to stop VSC from auto-updating "beta" builds.
+                packageJson.version = `99.0.0${versionSuffix}`
             } else {
                 packageJson.version = version.replace('-SNAPSHOT', versionSuffix)
             }

scripts/build/package.ts

@@ -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`,