Merge master into feature/editable_diffview

Author: aws-toolkit-automation

packages/core/src/awsService/sagemaker/hyperpodCommands.ts

@@ -16,9 +16,30 @@ const localize = nls.loadMessageBundle()
 
 export async function openHyperPodRemoteConnection(node: SagemakerDevSpaceNode): Promise<void> {
     await startHyperpodSpaceCommand(node)
+    await waitForDevSpaceRunning(node)
     await connectToHyperPodDevSpace(node)
 }
 
+async function waitForDevSpaceRunning(node: SagemakerDevSpaceNode): Promise<void> {
+    const kubectlClient = node.getParent().getKubectlClient(node.hpCluster.clusterName)
+    if (!kubectlClient) {
+        getLogger().error(`No kubectlClient available for cluster: ${node.hpCluster.clusterName}`)
+        return
+    }
+    const timeout = 5 * 60 * 1000 // 5 minutes
+    const startTime = Date.now()
+
+    while (Date.now() - startTime < timeout) {
+        const status = await kubectlClient.getHyperpodSpaceStatus(node.devSpace)
+        if (status === 'Running') {
+            return
+        }
+        await new Promise((resolve) => setTimeout(resolve, 5000))
+    }
+
+    throw new Error('Timeout waiting for dev space to reach Running status')
+}
+
 export async function connectToHyperPodDevSpace(node: SagemakerDevSpaceNode): Promise<void> {
     const logger = getLogger()
 

packages/core/src/shared/clients/kubectlClient.ts

@@ -73,13 +73,13 @@ export class KubectlClient {
                 void vscode.window.showErrorMessage(
                     `You do not have permission to view ${eksCluster.name} or its spaces. Please contact your administrator.`
                 )
-                throw new Error(
-                    `Error: User has insufficient permissions to view EKS cluster (${eksCluster.name}) or its spaces.`
+                getLogger().warn(
+                    `[Warning]: User has insufficient permissions to view EKS cluster (${eksCluster.name}) or its spaces.`
                 )
             }
 
-            getLogger().error(
-                `Error: Unavailable spaces for EKS Cluster (${eksCluster.name}): ${error}\nStack trace: ${(error as Error).stack}`
+            getLogger().warn(
+                `[Warning]: Unavailable spaces for EKS Cluster (${eksCluster.name}): ${error}\nStack trace: ${(error as Error).stack}`
             )
         }
         return []