Merge branch 'feature/stepfunctions-execution' into feature/stepfunctions-execution

laileni-aws · web-flow · commit 195e39aaf6ce · 2025-10-13T08:59:23.000-07:00
diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.99.0.json b/packages/amazonq/.changes/1.99.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-10",
+	"version": "1.99.0",
+	"entries": []
+}
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.99.0 2025-10-10
+
+- Miscellaneous non-user-facing changes
+
 ## 1.98.0 2025-10-02
 
 - Miscellaneous non-user-facing changes
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.99.0-SNAPSHOT",
+    "version": "1.100.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/core/src/awsService/sagemaker/commands.ts b/packages/core/src/awsService/sagemaker/commands.ts
@@ -133,6 +133,16 @@ export async function stopSpace(
     ctx: vscode.ExtensionContext,
     sageMakerClient?: SagemakerClient
 ) {
+    await tryRefreshNode(node)
+    if (node.getStatus() === 'Stopped' || node.getStatus() === 'Stopping') {
+        void vscode.window.showWarningMessage(`Space ${node.spaceApp.SpaceName} is already in Stopped/Stopping state.`)
+        return
+    } else if (node.getStatus() === 'Starting') {
+        void vscode.window.showWarningMessage(
+            `Space ${node.spaceApp.SpaceName} is in Starting state. Wait until it is Running to attempt stop again.`
+        )
+        return
+    }
     const spaceName = node.spaceApp.SpaceName!
     const confirmed = await showConfirmationMessage({
         prompt: `You are about to stop this space. Any active resource will also be stopped. Are you sure you want to stop the space?`,
@@ -179,7 +189,7 @@ export async function openRemoteConnect(
         void vscode.window.showErrorMessage(ConnectFromRemoteWorkspaceMessage)
         return
     }
-
+    await tryRefreshNode(node)
     if (node.getStatus() === 'Stopped') {
         //  In case of SMUS, we pass in a SM Client and for SM AI, it creates a new SM Client.
         const client = sageMakerClient ? sageMakerClient : new SagemakerClient(node.regionCode)
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts
@@ -275,7 +275,8 @@ function isExcludedSourceFile(path: string): boolean {
     return sourceExcludedExtensions.some((extension) => path.endsWith(extension))
 }
 
-// zip all dependency files and all source files excluding "target" (contains large JARs) plus ".git" and ".idea" (may appear in diff.patch)
+// zip all dependency files and all source files
+// excludes "target" (contains large JARs) plus ".git", ".idea", and ".github" (may appear in diff.patch)
 export function getFilesRecursively(dir: string, isDependenciesFolder: boolean): string[] {
     const entries = nodefs.readdirSync(dir, { withFileTypes: true })
     const files = entries.flatMap((entry) => {
@@ -284,7 +285,12 @@ export function getFilesRecursively(dir: string, isDependenciesFolder: boolean):
             if (isDependenciesFolder) {
                 // include all dependency files
                 return getFilesRecursively(res, isDependenciesFolder)
-            } else if (entry.name !== 'target' && entry.name !== '.git' && entry.name !== '.idea') {
+            } else if (
+                entry.name !== 'target' &&
+                entry.name !== '.git' &&
+                entry.name !== '.idea' &&
+                entry.name !== '.github'
+            ) {
                 // exclude the above directories when zipping source code
                 return getFilesRecursively(res, isDependenciesFolder)
             } else {
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts
@@ -139,8 +139,14 @@ export function validateCustomVersionsFile(fileContents: string) {
             getLogger().info('CodeTransformation: .YAML file must contain at least dependencies or plugins')
             return `YAML file must contain at least \`dependencies\` or \`plugins\` under \`dependencyManagement\``
         }
-        for (const item of dependenciesAndPlugins) {
-            const errorMessage = validateItem(item)
+        for (const item of dependencies) {
+            const errorMessage = validateItem(item, false)
+            if (errorMessage) {
+                return errorMessage
+            }
+        }
+        for (const item of plugins) {
+            const errorMessage = validateItem(item, true)
             if (errorMessage) {
                 return errorMessage
             }
@@ -153,10 +159,15 @@ export function validateCustomVersionsFile(fileContents: string) {
 }
 
 // return an error message, or undefined if item is valid
-function validateItem(item: any, validOriginTypes: string[] = ['FIRST_PARTY', 'THIRD_PARTY']) {
-    if (!/^[^\s:]+:[^\s:]+$/.test(item.identifier)) {
+function validateItem(item: any, isPlugin: boolean) {
+    const validOriginTypes = ['FIRST_PARTY', 'THIRD_PARTY']
+    if (!isPlugin && !/^[^\s:]+:[^\s:]+$/.test(item.identifier)) {
         getLogger().info(`CodeTransformation: Invalid identifier format: ${item.identifier}`)
-        return `Invalid identifier format: \`${item.identifier}\`. Must be in format \`groupId:artifactId\` without spaces`
+        return `Invalid dependency identifier format: \`${item.identifier}\`. Must be in format \`groupId:artifactId\` without spaces`
+    }
+    if (isPlugin && !item.identifier?.trim()) {
+        getLogger().info('CodeTransformation: Missing identifier in plugin')
+        return 'Missing `identifier` in plugin'
     }
     if (!validOriginTypes.includes(item.originType)) {
         getLogger().info(`CodeTransformation: Invalid originType: ${item.originType}`)
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts
@@ -17,14 +17,14 @@ import globals from '../../../shared/extensionGlobals'
 function collectDependenciesAndMetadata(dependenciesFolderPath: string, workingDirPath: string) {
     getLogger().info('CodeTransformation: running mvn clean test-compile with maven JAR')
 
-    const baseCommand = transformByQState.getMavenName()
+    const baseCommand = transformByQState.getMavenName() // always 'mvn'
     const jarPath = globals.context.asAbsolutePath(path.join('resources', 'amazonQCT', 'QCT-Maven-1-0-156-0.jar'))
 
     getLogger().info('CodeTransformation: running Maven extension with JAR')
 
     const args = [
-        `-Dmaven.ext.class.path=${jarPath}`,
-        `-Dcom.amazon.aws.developer.transform.jobDirectory=${dependenciesFolderPath}`,
+        `-Dmaven.ext.class.path="${jarPath}"`,
+        `-Dcom.amazon.aws.developer.transform.jobDirectory="${dependenciesFolderPath}"`,
         'clean',
         'test-compile',
     ]
diff --git a/packages/core/src/shared/sshConfig.ts b/packages/core/src/shared/sshConfig.ts
@@ -208,7 +208,7 @@ Host ${this.configHostName}
 
     protected createSSHConfigSection(proxyCommand: string): string {
         if (this.scriptPrefix === 'sagemaker_connect') {
-            return `${this.getSageMakerSSHConfig(proxyCommand)}User '%r'\n`
+            return `${this.getSageMakerSSHConfig(proxyCommand)}`
         } else if (this.keyPath) {
             return `${this.getBaseSSHConfig(proxyCommand)}IdentityFile '${this.keyPath}'\n    User '%r'\n`
         }
diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts
@@ -65,7 +65,7 @@ dependencyManagement:
       targetVersion: "3.0.0"
       originType: "THIRD_PARTY"
   plugins:
-    - identifier: "com.example:plugin"
+    - identifier: "plugin.id"
       targetVersion: "1.2.0"
       versionProperty: "plugin.version"  # Optional
       originType: "FIRST_PARTY" # or "THIRD_PARTY"`
@@ -503,6 +503,10 @@ dependencyManagement:
         await fs.mkdir(gitFolder)
         await fs.writeFile(path.join(gitFolder, 'config'), 'sample content for the test file')
 
+        const githubFolder = path.join(tempDir, '.github')
+        await fs.mkdir(githubFolder)
+        await fs.writeFile(path.join(githubFolder, 'config'), 'more sample content for the test file')
+
         const zippedFiles = getFilesRecursively(tempDir, false)
         assert.strictEqual(zippedFiles.length, 1)
     })
@@ -582,15 +586,21 @@ dependencyManagement:
         assert.strictEqual(errorMessage, `Missing required key: \`dependencyManagement\``)
     })
 
-    it(`WHEN validateCustomVersionsFile on .yaml file with invalid identifier format THEN fails validation`, function () {
+    it(`WHEN validateCustomVersionsFile on .yaml file with invalid dependency identifier format THEN fails validation`, function () {
         const invalidFile = validCustomVersionsFile.replace('com.example:library1', 'com.example-library1')
         const errorMessage = validateCustomVersionsFile(invalidFile)
         assert.strictEqual(
             errorMessage,
-            `Invalid identifier format: \`com.example-library1\`. Must be in format \`groupId:artifactId\` without spaces`
+            `Invalid dependency identifier format: \`com.example-library1\`. Must be in format \`groupId:artifactId\` without spaces`
         )
     })
 
+    it(`WHEN validateCustomVersionsFile on .yaml file with missing plugin identifier format THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('plugin.id', '')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(errorMessage, 'Missing `identifier` in plugin')
+    })
+
     it(`WHEN validateCustomVersionsFile on .yaml file with invalid originType THEN fails validation`, function () {
         const invalidFile = validCustomVersionsFile.replace('FIRST_PARTY', 'INVALID_TYPE')
         const errorMessage = validateCustomVersionsFile(invalidFile)
diff --git a/packages/toolkit/.changes/3.79.0.json b/packages/toolkit/.changes/3.79.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-10",
+	"version": "3.79.0",
+	"entries": []
+}
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.79.0 2025-10-10
+
+- Miscellaneous non-user-facing changes
+
 ## 3.78.0 2025-10-02
 
 - **Feature** Refactor and optimize Lambda Remote Invoke UI with enhanced payload management
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
-    "version": "3.79.0-SNAPSHOT",
+    "version": "3.80.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ Host ${this.configHostName}`
`208`	`208`
`209`	`209`	`protected createSSHConfigSection(proxyCommand: string): string {`
`210`	`210`	`if (this.scriptPrefix === 'sagemaker_connect') {`
`211`		- return `${this.getSageMakerSSHConfig(proxyCommand)}User '%r'\n`
	`211`	+ return `${this.getSageMakerSSHConfig(proxyCommand)}`
`212`	`212`	`} else if (this.keyPath) {`
`213`	`213`	return `${this.getBaseSSHConfig(proxyCommand)}IdentityFile '${this.keyPath}'\n User '%r'\n`
`214`	`214`	`}`