Merge branch 'master' into feature/oidc-bug-fix

laileni-aws · web-flow · commit c1f8a4c3d59b · 2025-11-17T11:54:42.000-08: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.104.0.json b/packages/amazonq/.changes/1.104.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-11-15",
+	"version": "1.104.0",
+	"entries": []
+}
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.104.0 2025-11-15
+
+- Miscellaneous non-user-facing changes
+
 ## 1.103.0 2025-11-06
 
 - **Feature** Q CodeTransformation: add more job metadata to history table
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.104.0-SNAPSHOT",
+    "version": "1.105.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/core/src/awsService/sagemaker/commands.ts b/packages/core/src/awsService/sagemaker/commands.ts
@@ -301,7 +301,7 @@ async function handleRunningSpaceWithDisabledAccess(
 
     const confirmed = await showConfirmationMessage({
         prompt,
-        confirm: 'Restart and Connect',
+        confirm: 'Restart Space and Connect',
         cancel: 'Cancel',
         type: 'warning',
     })
diff --git a/packages/core/src/awsService/sagemaker/constants.ts b/packages/core/src/awsService/sagemaker/constants.ts
@@ -36,7 +36,7 @@ export const InstanceTypeInsufficientMemoryMessage = (
     chosenInstanceType: string,
     recommendedInstanceType: string
 ) => {
-    return `Unable to create app for [${spaceName}] because instanceType [${chosenInstanceType}] is not supported for remote access enabled spaces. Use instanceType with at least 8 GiB memory. Would you like to start your space with instanceType [${recommendedInstanceType}]?`
+    return `[${chosenInstanceType}] does not support remote access. Use an instanceType with at least 8 GiB memory. Would you like to start your space with instanceType [${recommendedInstanceType}]?`
 }
 
 export const InstanceTypeNotSelectedMessage = (spaceName: string) => {
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.ts
@@ -132,7 +132,7 @@ export class SageMakerUnifiedStudioProjectNode implements TreeNode {
                 if (this.isFirstTimeSelection && !this.hasShownFirstTimeMessage) {
                     this.hasShownFirstTimeMessage = true
                     void vscode.window.showInformationMessage(
-                        'Find your space in the Explorer panel under SageMaker Unified Studio. Hover over any space and click the connection icon to connect remotely.'
+                        'Find your space in the Explorer panel under SageMaker Unified Studio. Hover over a space and click the connection icon to connect remotely.'
                     )
                 }
                 this.sagemakerClient = await this.initializeSagemakerClient(spaceAwsAccountRegion)
diff --git a/packages/core/src/shared/clients/sagemaker.ts b/packages/core/src/shared/clients/sagemaker.ts
@@ -180,7 +180,7 @@ export class SagemakerClient extends ClientWrapper<SageMakerClient> {
                         instanceType,
                         InstanceTypeInsufficientMemory[instanceType]
                     ),
-                    confirm: 'Restart and Connect',
+                    confirm: 'Restart Space and Connect',
                     cancel: 'Cancel',
                     type: 'warning',
                 })
diff --git a/packages/core/src/test/awsService/sagemaker/commands.test.ts b/packages/core/src/test/awsService/sagemaker/commands.test.ts
@@ -124,7 +124,7 @@ describe('SageMaker Commands', () => {
                 // Setup test window to handle confirmation dialog
                 getTestWindow().onDidShowMessage((message) => {
                     if (message.message.includes(RemoteAccessRequiredMessage)) {
-                        message.selectItem('Restart and Connect')
+                        message.selectItem('Restart Space and Connect')
                     }
                 })
 
@@ -182,7 +182,7 @@ describe('SageMaker Commands', () => {
                             InstanceTypeInsufficientMemoryMessage('test-space', 'ml.t3.medium', 'ml.t3.large')
                         )
                     ) {
-                        message.selectItem('Restart and Connect')
+                        message.selectItem('Restart Space and Connect')
                     }
                 })
 
@@ -236,8 +236,8 @@ describe('SageMaker Commands', () => {
 
                 // Setup test window to confirm
                 getTestWindow().onDidShowMessage((message) => {
-                    if (message.items.some((item) => item.title === 'Restart and Connect')) {
-                        message.selectItem('Restart and Connect')
+                    if (message.items.some((item) => item.title === 'Restart Space and Connect')) {
+                        message.selectItem('Restart Space and Connect')
                     }
                 })
 
@@ -337,7 +337,7 @@ describe('SageMaker Commands', () => {
 
                 // Verify no confirmation dialog shown for stopped space
                 const confirmMessages = getTestWindow().shownMessages.filter((m) =>
-                    m.message.includes('Restart and Connect')
+                    m.message.includes('Restart Space and Connect')
                 )
                 assert.strictEqual(confirmMessages.length, 0, 'Should not show confirmation for stopped space')
 
@@ -388,7 +388,7 @@ describe('SageMaker Commands', () => {
                 assert(mockTryRefreshNode.calledOnce)
                 // Verify no confirmation needed
                 const confirmMessages = getTestWindow().shownMessages.filter((m) =>
-                    m.message.includes('Restart and Connect')
+                    m.message.includes('Restart Space and Connect')
                 )
                 assert.strictEqual(confirmMessages.length, 0)
                 // Verify no space operations performed
diff --git a/packages/core/src/test/shared/clients/sagemakerClient.test.ts b/packages/core/src/test/shared/clients/sagemakerClient.test.ts
@@ -11,6 +11,7 @@ import { DescribeDomainResponse } from '@amzn/sagemaker-client'
 import { intoCollection } from '../../../shared/utilities/collectionUtils'
 import { ToolkitError } from '../../../shared/errors'
 import { getTestWindow } from '../vscode/window'
+import { InstanceTypeInsufficientMemoryMessage } from '../../../awsService/sagemaker/constants'
 
 describe('SagemakerClient.fetchSpaceAppsAndDomains', function () {
     const region = 'test-region'
@@ -398,9 +399,10 @@ describe('SagemakerClient.startSpace', function () {
 
         const promise = client.startSpace('my-space', 'my-domain')
 
-        // Wait for the error message to appear and select "Restart and Connect"
-        await getTestWindow().waitForMessage(/not supported for remote access/)
-        getTestWindow().getFirstMessage().selectItem('Restart and Connect')
+        // Wait for the error message to appear and select "Restart Space and Connect"
+        const expectedMessage = InstanceTypeInsufficientMemoryMessage('my-space', 'ml.t3.medium', 'ml.t3.large')
+        await getTestWindow().waitForMessage(new RegExp(expectedMessage.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')))
+        getTestWindow().getFirstMessage().selectItem('Restart Space and Connect')
 
         await promise
         sinon.assert.calledOnce(updateSpaceStub)
@@ -424,7 +426,8 @@ describe('SagemakerClient.startSpace', function () {
         const promise = client.startSpace('my-space', 'my-domain')
 
         // Wait for the error message to appear and select "Cancel"
-        await getTestWindow().waitForMessage(/not supported for remote access/)
+        const expectedMessage = InstanceTypeInsufficientMemoryMessage('my-space', 'ml.t3.medium', 'ml.t3.large')
+        await getTestWindow().waitForMessage(new RegExp(expectedMessage.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')))
         getTestWindow().getFirstMessage().selectItem('Cancel')
 
         await assert.rejects(promise, (err: ToolkitError) => err.message === 'InstanceType has insufficient memory.')
diff --git a/packages/toolkit/.changes/3.84.0.json b/packages/toolkit/.changes/3.84.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-11-15",
+	"version": "3.84.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "SageMaker: Improved UX for connecting to running spaces with better progress indicators and streamlined remote access handling"
+		},
+		{
+			"type": "Feature",
+			"description": "Deeplink support for SageMaker Unified Studio"
+		}
+	]
+}
diff --git a/packages/toolkit/.changes/next-release/Feature-4c794a68-e807-405c-8d31-2c91e3efd574.json b/packages/toolkit/.changes/next-release/Feature-4c794a68-e807-405c-8d31-2c91e3efd574.json
diff --git a/packages/toolkit/.changes/next-release/Feature-d8fd25bc-f07e-4581-a176-4ebf9d9eb606.json b/packages/toolkit/.changes/next-release/Feature-d8fd25bc-f07e-4581-a176-4ebf9d9eb606.json
diff --git a/packages/toolkit/.changes/next-release/feature-smus-ux-improvements.json b/packages/toolkit/.changes/next-release/feature-smus-ux-improvements.json
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.84.0 2025-11-15
+
+- **Feature** SageMaker: Improved UX for connecting to running spaces with better progress indicators and streamlined remote access handling
+- **Feature** Deeplink support for SageMaker Unified Studio
+
 ## 3.83.0 2025-11-06
 
 - Miscellaneous non-user-facing changes
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.84.0-SNAPSHOT",
+    "version": "3.85.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export const InstanceTypeInsufficientMemoryMessage = (`
`36`	`36`	`chosenInstanceType: string,`
`37`	`37`	`recommendedInstanceType: string`
`38`	`38`	`) => {`
`39`		- return `Unable to create app for [${spaceName}] because instanceType [${chosenInstanceType}] is not supported for remote access enabled spaces. Use instanceType with at least 8 GiB memory. Would you like to start your space with instanceType [${recommendedInstanceType}]?`
	`39`	+ return `[${chosenInstanceType}] does not support remote access. Use an instanceType with at least 8 GiB memory. Would you like to start your space with instanceType [${recommendedInstanceType}]?`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`export const InstanceTypeNotSelectedMessage = (spaceName: string) => {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ export class SageMakerUnifiedStudioProjectNode implements TreeNode {`
`132`	`132`	`if (this.isFirstTimeSelection && !this.hasShownFirstTimeMessage) {`
`133`	`133`	`this.hasShownFirstTimeMessage = true`
`134`	`134`	`void vscode.window.showInformationMessage(`
`135`		`- 'Find your space in the Explorer panel under SageMaker Unified Studio. Hover over any space and click the connection icon to connect remotely.'`
	`135`	`+ 'Find your space in the Explorer panel under SageMaker Unified Studio. Hover over a space and click the connection icon to connect remotely.'`
`136`	`136`	`)`
`137`	`137`	`}`
`138`	`138`	`this.sagemakerClient = await this.initializeSagemakerClient(spaceAwsAccountRegion)`