Move resource metadata parsing logic in helper function

Author: Arun Bhati

patched-vscode/extensions/sagemaker-extension/src/constant.ts

@@ -84,7 +84,7 @@ export function getExpiryTime(cookie: SagemakerCookie): number {
  * Constructs the SMUS portal URL using domain, region, and project information
  * Returns null if not in SMUS environment or if required fields are missing
  */
-export const getSmusVscodePortalUrl = (metadata: SagemakerResourceMetadata): string | null => {
+export const getSmusVscodePortalUrl = (metadata: SagemakerResourceMetadata | null): string | null => {
 	if (process.env[SERVICE_NAME_ENV_VAR] !== SMUS_SERVICE_NAME) {
 		return null;
 	}

patched-vscode/extensions/sagemaker-extension/src/extension.ts

@@ -23,6 +23,21 @@ const ENABLE_AUTO_UPDATE_COMMAND = 'workbench.extensions.action.enableAutoUpdate
 // Global redirect URL for SMUS environment
 let smusRedirectUrl: string | null = null;
 
+function fetchMetadata(): SagemakerResourceMetadata | null {
+    try {
+        const data = fs.readFileSync(SAGEMAKER_METADATA_PATH, 'utf-8');
+        return JSON.parse(data) as SagemakerResourceMetadata;
+    } catch (error) {
+        // fail silently not to block users
+        console.error('Error reading metadata file:', error);
+        return null;
+    }
+}
+
+function initializeSmusRedirectUrl() {
+    smusRedirectUrl = getSmusVscodePortalUrl(fetchMetadata());
+}
+
 function showWarningDialog() {
     vscode.commands.executeCommand(PARSE_SAGEMAKER_COOKIE_COMMAND).then(response => {
 
@@ -107,22 +122,12 @@ function renewSession(sagemakerCookie: SagemakerCookie) {
 }
 
 function updateStatusItemWithMetadata(context: vscode.ExtensionContext) {
-    try {
-        const data = fs.readFileSync(SAGEMAKER_METADATA_PATH, 'utf-8');
-        const jsonData = JSON.parse(data) as SagemakerResourceMetadata;
-
-        if (jsonData?.SpaceName) {
-            let spaceNameStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100);
-            spaceNameStatusBarItem.text = `Space: ${jsonData.SpaceName}`;
-            spaceNameStatusBarItem.show();
-            context.subscriptions.push(spaceNameStatusBarItem);
-        }
-
-        // Initialize SMUS redirect URL
-        smusRedirectUrl = getSmusVscodePortalUrl(jsonData);
-    } catch (error) {
-        // fail silently not to block users
-        console.error('Error reading metadata file:', error);
+    const metadata = fetchMetadata();
+    if (metadata?.SpaceName) {
+        let spaceNameStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100);
+        spaceNameStatusBarItem.text = `Space: ${metadata.SpaceName}`;
+        spaceNameStatusBarItem.show();
+        context.subscriptions.push(spaceNameStatusBarItem);
     }
 }
 
@@ -162,15 +167,16 @@ export function activate(context: vscode.ExtensionContext) {
     // TODO: log activation of extension
     console.log('Activating Sagemaker Extension...');
 
-    // Initialize metadata first (which will set smusRedirectUrl if in SMUS environment)
-    updateStatusItemWithMetadata(context);
+    // First set smusRedirectUrl if we are in SMUS environment
+    initializeSmusRedirectUrl();
 
     // execute the get cookie command and save the data to cookies
     vscode.commands.executeCommand(PARSE_SAGEMAKER_COOKIE_COMMAND).then(r => {
 
         const sagemakerCookie: SagemakerCookie = r as SagemakerCookie
 
         initialize(sagemakerCookie);
+        updateStatusItemWithMetadata(context);
     });
 
     // render warning message regarding auto upgrade disabled

patches/sagemaker-extension-smus-support.patch

@@ -37,7 +37,7 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/constant.
 + * Constructs the SMUS portal URL using domain, region, and project information
 + * Returns null if not in SMUS environment or if required fields are missing
 + */
-+export const getSmusVscodePortalUrl = (metadata: SagemakerResourceMetadata): string | null => {
++export const getSmusVscodePortalUrl = (metadata: SagemakerResourceMetadata | null): string | null => {
 +	if (process.env[SERVICE_NAME_ENV_VAR] !== SMUS_SERVICE_NAME) {
 +		return null;
 +	}
@@ -77,17 +77,32 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/extension
  } from "./constant";
  import * as console from "console";
 
-@@ -19,6 +20,9 @@ import * as console from "console";
+@@ -19,6 +20,24 @@ import * as console from "console";
  const PARSE_SAGEMAKER_COOKIE_COMMAND = 'sagemaker.parseCookies';
  const ENABLE_AUTO_UPDATE_COMMAND = 'workbench.extensions.action.enableAutoUpdate';
 
 +// Global redirect URL for SMUS environment
 +let smusRedirectUrl: string | null = null;
++
++function fetchMetadata(): SagemakerResourceMetadata | null {
++    try {
++        const data = fs.readFileSync(SAGEMAKER_METADATA_PATH, 'utf-8');
++        return JSON.parse(data) as SagemakerResourceMetadata;
++    } catch (error) {
++        // fail silently not to block users
++        console.error('Error reading metadata file:', error);
++        return null;
++    }
++}
++
++function initializeSmusRedirectUrl() {
++    smusRedirectUrl = getSmusVscodePortalUrl(fetchMetadata());
++}
 +
  function showWarningDialog() {
      vscode.commands.executeCommand(PARSE_SAGEMAKER_COOKIE_COMMAND).then(response => {
 
-@@ -59,11 +63,12 @@ function showWarningDialog() {
+@@ -59,11 +78,12 @@ function showWarningDialog() {
  }
 
  function signInError(sagemakerCookie: SagemakerCookie) {
@@ -101,7 +116,7 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/extension
              }
          });
  }
-@@ -94,32 +99,31 @@ function saveWorkspace() {
+@@ -94,32 +114,21 @@ function saveWorkspace() {
      });
  }
  function renewSession(sagemakerCookie: SagemakerCookie) {
@@ -131,43 +146,29 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-extension/src/extension
 -            } catch (jsonError) {
 -                // fail silently not to block users
 -            }
-+    try {
-+        const data = fs.readFileSync(SAGEMAKER_METADATA_PATH, 'utf-8');
-+        const jsonData = JSON.parse(data) as SagemakerResourceMetadata;
-+
-+        if (jsonData?.SpaceName) {
-+            let spaceNameStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100);
-+            spaceNameStatusBarItem.text = `Space: ${jsonData.SpaceName}`;
-+            spaceNameStatusBarItem.show();
-+            context.subscriptions.push(spaceNameStatusBarItem);
-         }
+-        }
 -    });
-+
-+        // Initialize SMUS redirect URL
-+        smusRedirectUrl = getSmusVscodePortalUrl(jsonData);
-+    } catch (error) {
-+        // fail silently not to block users
-+        console.error('Error reading metadata file:', error);
++    const metadata = fetchMetadata();
++    if (metadata?.SpaceName) {
++        let spaceNameStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100);
++        spaceNameStatusBarItem.text = `Space: ${metadata.SpaceName}`;
++        spaceNameStatusBarItem.show();
++        context.subscriptions.push(spaceNameStatusBarItem);
 +    }
  }
 
  // Render warning message regarding auto upgrade disabled
-@@ -158,15 +162,25 @@ export function activate(context: vscode
+@@ -158,6 +167,9 @@ export function activate(context: vscode
      // TODO: log activation of extension
      console.log('Activating Sagemaker Extension...');
 
-+    // Initialize metadata first (which will set smusRedirectUrl if in SMUS environment)
-+    updateStatusItemWithMetadata(context);
++    // First set smusRedirectUrl if we are in SMUS environment
++    initializeSmusRedirectUrl();
 +
      // execute the get cookie command and save the data to cookies
      vscode.commands.executeCommand(PARSE_SAGEMAKER_COOKIE_COMMAND).then(r => {
 
-         const sagemakerCookie: SagemakerCookie = r as SagemakerCookie
- 
-         initialize(sagemakerCookie);
--        updateStatusItemWithMetadata(context);
-     });
- 
+@@ -170,3 +182,11 @@ export function activate(context: vscode
      // render warning message regarding auto upgrade disabled
      renderExtensionAutoUpgradeDisabledNotification();
  }