Skip to content

fix(sagemaker): singleton window bug #8385

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

Open
aws-ajangg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(sagemaker): singleton window bug #8385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c754300
Fix singleton window bug
aws-ajangg Dec 3, 2025
b025fb0
k8s naming convention validation
aws-ajangg Dec 4, 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
53 changes: 52 additions & 1 deletion packages/core/src/awsService/sagemaker/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,13 @@ export async function deeplinkConnect(

try {
let connectionType = 'sm_dl'
if (domain === '') {
if (!domain && eksClusterArn && workspaceName && namespace) {
const { accountId, region, clusterName } = parseEKSClusterArn(eksClusterArn)
connectionType = 'sm_hp'
session = `${workspaceName}_${namespace}_${clusterName}_${region}_${accountId}`
if (!isValidK8sLabel(session)) {
session = createValidK8sSession(workspaceName, namespace, clusterName, region, accountId)
}
}
const remoteEnv = await prepareDevEnvConnection(
connectionIdentifier,
Expand Down Expand Up @@ -179,6 +184,52 @@ export async function deeplinkConnect(
}
}

function parseEKSClusterArn(eksClusterArn: string): { accountId: string; region: string; clusterName: string } {
const parts = eksClusterArn.split(':')
if (parts.length !== 6) {
throw new Error(`Invalid EKS cluster ARN: ${eksClusterArn}`)
}
const accountId = parts[4]
const region = parts[3]
const clusterName = parts[5].split('/')[1]
return { accountId, region, clusterName }
}

/**
* Validates and sanitizes session names for Kubernetes DNS label compliance
*/
function createValidK8sSession(
workspaceName: string,
namespace: string,
clusterName: string,
region: string,
accountId: string
): string {
const sanitize = (str: string): string =>
str
.toLowerCase()
.replace(/[^a-z0-9-]/g, '-')
.replace(/^-+|-+$/g, '')
.substring(0, 15)

const components = [workspaceName, namespace, clusterName, region, accountId]
.map(sanitize)
.filter((c) => c.length > 0)

const session = components
.join('_')
.substring(0, 63)
.replace(/^-+|-+$/g, '')
return session
}

/**
* Validates if a string meets K8s DNS label requirements
*/
function isValidK8sLabel(label: string): boolean {
return /^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$/.test(label)
}

export async function stopSpace(
node: SagemakerSpaceNode | SagemakerUnifiedStudioSpaceNode,
ctx: vscode.ExtensionContext,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/awsService/sagemaker/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export async function prepareDevEnvConnection(

const hyperPodEnv: NodeJS.ProcessEnv = {
AWS_REGION: region,
SESSION_ID: session || '',
SESSION_ID: hostname || '',
Copy link
Contributor

@aws-asolidu aws-asolidu Dec 4, 2025

Choose a reason for hiding this comment

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

why can't this be session?

Copy link
Contributor Author

@aws-ajangg aws-ajangg Dec 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

hostname also uses session but session is randomly generated in the presigned url and this is what's causing a new external window to be opened when the user tries to connect to the workspace.

After discussing with @edwardps, we decided to use a deterministic unique identifier for the hostname instead

STREAM_URL: decodedWsUrl,
TOKEN: decodedToken,
AWS_SSM_CLI: ssm,
Expand Down
Loading