Adding env var for project storage path, updating path to libmgmt script (#719)

Co-authored-by: Tejas Kashinath <[email protected]>

Author: tejaskash

template/v2/dirs/etc/sagemaker-ui/libmgmt/install-lib.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -eux
-
+PROJECT_DIR=${SMUS_PROJECT_DIR:-"$HOME/src"}
 # Check if the .libs.json file exists
-if [ -e $1/.libs.json ]; then
-  lib_config_json=`cat $1/.libs.json`
+if [ -e $PROJECT_DIR/.libs.json ]; then
+  lib_config_json=`cat $PROJECT_DIR/.libs.json`
 
   apply_change_to_space=`echo $lib_config_json | jq -r '.ApplyChangeToSpace'`
   # Extract conda channels from the config, add `-c ` before each channel and join the strings

template/v2/dirs/etc/sagemaker-ui/sagemaker_ui_post_startup.sh

@@ -157,6 +157,21 @@ echo "Checking Project Storage Type"
 is_s3_storage
 is_s3_storage_flag=$?  # 0 if S3 storage, 1 if Git
 
+if [ "$is_s3_storage_flag" -eq 0 ]; then
+    export SMUS_PROJECT_DIR="$HOME/shared"
+    echo "Project is using S3 storage, project directory set to: $SMUS_PROJECT_DIR"
+else
+    export SMUS_PROJECT_DIR="$HOME/src"
+    echo "Project is using Git storage, project directory set to: $SMUS_PROJECT_DIR"
+fi
+
+if grep -q "^SMUS_PROJECT_DIR=" ~/.bashrc; then
+  echo "SMUS_PROJECT_DIR is defined in the env"
+else
+  echo SMUS_PROJECT_DIR="$SMUS_PROJECT_DIR" >> ~/.bashrc
+  echo readonly SMUS_PROJECT_DIR >> ~/.bashrc
+fi
+
 if [ $is_s3_storage_flag -ne 0 ]; then
   # Creating a directory where the repository will be cloned
   mkdir -p "$HOME/src"
@@ -189,7 +204,7 @@ if [ "${SAGEMAKER_APP_TYPE_LOWERCASE}" = "jupyterlab" ]; then
     # code will be returned if there is not a minimum of 2
     # CPU cores available.
     # Start workflows local runner
-    bash /etc/sagemaker-ui/workflows/start-workflows-container.sh "$is_s3_storage_flag"
+    bash /etc/sagemaker-ui/workflows/start-workflows-container.sh
 
     # ensure functions inherit traps and fail immediately
     set -eE
@@ -198,7 +213,7 @@ if [ "${SAGEMAKER_APP_TYPE_LOWERCASE}" = "jupyterlab" ]; then
     trap 'write_status_to_file "error" "An unexpected error occurred. Please stop and restart your space to retry."' ERR
 
     # Install conda and pip dependencies if lib mgmt config existing
-    bash /etc/sagemaker-ui/libmgmt/install-lib.sh $HOME/src
+    bash /etc/sagemaker-ui/libmgmt/install-lib.sh
 
     # Install sm-spark-cli
     bash /etc/sagemaker-ui/workflows/sm-spark-cli-install.sh

template/v2/dirs/etc/sagemaker-ui/workflows/start-workflows-container.sh

@@ -1,16 +1,8 @@
 #!/bin/bash
 set -eu
 
-# Get the is_s3_storage_flag parameter passed from the calling script
-is_s3_storage=${1:-"1"}  # Default to 1 (Git storage) if no parameter is passed
-# Set project directory based on storage type
-if [ "$is_s3_storage" -eq 0 ]; then
-    PROJECT_DIR="$HOME/shared"
-    echo "Project is using S3 storage, project directory set to: $PROJECT_DIR"
-else
-    PROJECT_DIR="$HOME/src"
-    echo "Project is using Git storage, project directory set to: $PROJECT_DIR"
-fi
+# Get project directory based on storage type
+PROJECT_DIR=${SMUS_PROJECT_DIR:-"$HOME/src"}
 
 # Datazone project metadata
 RESOURCE_METADATA_FILE=/opt/ml/metadata/resource-metadata.json

template/v3/dirs/etc/sagemaker-ui/libmgmt/install-lib.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -eux
-
+PROJECT_DIR=${SMUS_PROJECT_DIR:-"$HOME/src"}
 # Check if the .libs.json file exists
-if [ -e $1/.libs.json ]; then
-  lib_config_json=`cat $1/.libs.json`
+if [ -e $PROJECT_DIR/.libs.json ]; then
+  lib_config_json=`cat $PROJECT_DIR/.libs.json`
 
   apply_change_to_space=`echo $lib_config_json | jq -r '.ApplyChangeToSpace'`
   # Extract conda channels from the config, add `-c ` before each channel and join the strings

template/v3/dirs/etc/sagemaker-ui/sagemaker_ui_post_startup.sh

@@ -157,6 +157,21 @@ echo "Checking Project Storage Type"
 is_s3_storage
 is_s3_storage_flag=$?  # 0 if S3 storage, 1 if Git
 
+if [ "$is_s3_storage_flag" -eq 0 ]; then
+    export SMUS_PROJECT_DIR="$HOME/shared"
+    echo "Project is using S3 storage, project directory set to: $SMUS_PROJECT_DIR"
+else
+    export SMUS_PROJECT_DIR="$HOME/src"
+    echo "Project is using Git storage, project directory set to: $SMUS_PROJECT_DIR"
+fi
+
+if grep -q "^SMUS_PROJECT_DIR=" ~/.bashrc; then
+  echo "SMUS_PROJECT_DIR is defined in the env"
+else
+  echo SMUS_PROJECT_DIR="$SMUS_PROJECT_DIR" >> ~/.bashrc
+  echo readonly SMUS_PROJECT_DIR >> ~/.bashrc
+fi
+
 if [ $is_s3_storage_flag -ne 0 ]; then
   # Creating a directory where the repository will be cloned
   mkdir -p "$HOME/src"
@@ -189,7 +204,7 @@ if [ "${SAGEMAKER_APP_TYPE_LOWERCASE}" = "jupyterlab" ]; then
     # code will be returned if there is not a minimum of 2
     # CPU cores available.
     # Start workflows local runner
-    bash /etc/sagemaker-ui/workflows/start-workflows-container.sh "$is_s3_storage_flag"
+    bash /etc/sagemaker-ui/workflows/start-workflows-container.sh
 
     # ensure functions inherit traps and fail immediately
     set -eE
@@ -198,7 +213,7 @@ if [ "${SAGEMAKER_APP_TYPE_LOWERCASE}" = "jupyterlab" ]; then
     trap 'write_status_to_file "error" "An unexpected error occurred. Please stop and restart your space to retry."' ERR
 
     # Install conda and pip dependencies if lib mgmt config existing
-    bash /etc/sagemaker-ui/libmgmt/install-lib.sh $HOME/src
+    bash /etc/sagemaker-ui/libmgmt/install-lib.sh
 
     # Install sm-spark-cli
     bash /etc/sagemaker-ui/workflows/sm-spark-cli-install.sh

template/v3/dirs/etc/sagemaker-ui/workflows/start-workflows-container.sh

@@ -1,16 +1,8 @@
 #!/bin/bash
 set -eu
 
-# Get the is_s3_storage_flag parameter passed from the calling script
-is_s3_storage=${1:-"1"}  # Default to 1 (Git storage) if no parameter is passed
-# Set project directory based on storage type
-if [ "$is_s3_storage" -eq 0 ]; then
-    PROJECT_DIR="$HOME/shared"
-    echo "Project is using S3 storage, project directory set to: $PROJECT_DIR"
-else
-    PROJECT_DIR="$HOME/src"
-    echo "Project is using Git storage, project directory set to: $PROJECT_DIR"
-fi
+# Get project directory based on storage type
+PROJECT_DIR=${SMUS_PROJECT_DIR:-"$HOME/src"}
 
 # Datazone project metadata
 RESOURCE_METADATA_FILE=/opt/ml/metadata/resource-metadata.json