Skip to content

fix(smus): update space before creating new app if space setting is changed #8170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

fix(smus): update space before creating new app if space setting is changed #8170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bb0309
telemetry: add project account id and region
kzr-at-amazon Sep 19, 2025
d93cf4d
Merge branch 'master' into master
laileni-aws Sep 24, 2025
c502ec0
update space before creating new app if space setting is changed
kzr-at-amazon Oct 11, 2025
5d14ece
Merge branch 'aws:master' into master
kzr-at-amazon Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 32 additions & 11 deletions packages/core/src/shared/clients/sagemaker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ import { yes, no, continueText, cancel } from '../localizedText'
import { AwsCredentialIdentity } from '@aws-sdk/types'
import globals from '../extensionGlobals'

const appTypeSettingsMap: Record<string, string> = {
[AppType.JupyterLab as string]: 'JupyterLabAppSettings',
[AppType.CodeEditor as string]: 'CodeEditorAppSettings',
} as const

export interface SagemakerSpaceApp extends SpaceDetails {
App?: AppDetails
DomainSpaceKey: string
Expand Down Expand Up @@ -136,13 +141,13 @@ export class SagemakerClient extends ClientWrapper<SageMakerClient> {

// Get app type
const appType = spaceDetails.SpaceSettings?.AppType
if (appType !== 'JupyterLab' && appType !== 'CodeEditor') {
if (!appType || !(appType in appTypeSettingsMap)) {
throw new ToolkitError(`Unsupported AppType "${appType}" for space "${spaceName}"`)
}

// Get app resource spec
const requestedResourceSpec =
appType === 'JupyterLab'
appType === AppType.JupyterLab
? spaceDetails.SpaceSettings?.JupyterLabAppSettings?.DefaultResourceSpec
: spaceDetails.SpaceSettings?.CodeEditorAppSettings?.DefaultResourceSpec

Expand Down Expand Up @@ -181,16 +186,30 @@ export class SagemakerClient extends ClientWrapper<SageMakerClient> {
instanceType = InstanceTypeMinimum
}

// Get remote access flag
if (!spaceDetails.SpaceSettings?.RemoteAccess || spaceDetails.SpaceSettings?.RemoteAccess === 'DISABLED') {
// First, update the space if needed
const needsRemoteAccess =
!spaceDetails.SpaceSettings?.RemoteAccess || spaceDetails.SpaceSettings?.RemoteAccess === 'DISABLED'
const instanceTypeChanged = requestedResourceSpec?.InstanceType !== instanceType

if (needsRemoteAccess || instanceTypeChanged) {
const updateSpaceRequest: UpdateSpaceCommandInput = {
DomainId: domainId,
SpaceName: spaceName,
SpaceSettings: {
...(needsRemoteAccess && { RemoteAccess: 'ENABLED' }),
...(instanceTypeChanged && {
[appTypeSettingsMap[appType]]: {
DefaultResourceSpec: {
InstanceType: instanceType,
},
Comment on lines +202 to +204
Copy link
Contributor

@vpbhargav vpbhargav Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there were other values in DefaultResourceSpec already (eg - ImageArn), would this overwrite it or leave it as is and only update instance type?
If it overwrites, that is not the behavior we want, we should only be updating instance type and not the other params.

},
}),
},
}

try {
await this.updateSpace({
DomainId: domainId,
SpaceName: spaceName,
SpaceSettings: {
RemoteAccess: 'ENABLED',
},
})
getLogger().debug('SagemakerClient: Updating space: domainId=%s, spaceName=%s', domainId, spaceName)
await this.updateSpace(updateSpaceRequest)
await this.waitForSpaceInService(spaceName, domainId)
} catch (err) {
throw this.handleStartSpaceError(err)
Expand All @@ -214,6 +233,7 @@ export class SagemakerClient extends ClientWrapper<SageMakerClient> {
? { ...resourceSpec, EnvironmentArn: undefined, EnvironmentVersionArn: undefined }
: resourceSpec

// Second, create the App
const createAppRequest: CreateAppCommandInput = {
DomainId: domainId,
SpaceName: spaceName,
Expand All @@ -223,6 +243,7 @@ export class SagemakerClient extends ClientWrapper<SageMakerClient> {
}

try {
getLogger().debug('SagemakerClient: Creating app: domainId=%s, spaceName=%s', domainId, spaceName)
await this.createApp(createAppRequest)
} catch (err) {
throw this.handleStartSpaceError(err)
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/test/shared/clients/sagemakerClient.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ describe('SagemakerClient.startSpace', function () {
getTestWindow().getFirstMessage().selectItem('Yes')

await promise
sinon.assert.calledOnce(updateSpaceStub)
sinon.assert.calledOnce(createAppStub)
})

Expand Down
Loading