Rewrite autosource as function to avoid subshell isolation

elastic · Oct 25, 2024 · 7405df4 · 7405df4
1 parent 83a87b1
commit 7405df4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/scripts/rca-demo/autosource.sh b/scripts/rca-demo/autosource.sh
diff --git a/scripts/rca-demo/create-release-annotation b/scripts/rca-demo/create-release-annotation
@@ -1,12 +1,13 @@
 #!/bin/bash
 
 SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
-$SCRIPTS_DIR/autosource.sh
 
 set -a
 source $SCRIPTS_DIR/shared.sh
 set +a
 
+autosource
+
 if [ -z "${KIBANA_URL}" ]; then
   die "You must set KIBANA_URL to a valid Kibana URL"
 fi

diff --git a/scripts/rca-demo/post-setup b/scripts/rca-demo/post-setup
@@ -1,12 +1,13 @@
 #!/bin/bash
 
 SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
-$SCRIPTS_DIR/autosource.sh
 
 set -a
 source $SCRIPTS_DIR/shared.sh
 set +a
 
+autosource
+
 create_data_view () {
 	ID=$1
 	INDICES=$2

diff --git a/scripts/rca-demo/setup b/scripts/rca-demo/setup
@@ -1,12 +1,13 @@
 #!/bin/bash
 
 SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
-$SCRIPTS_DIR/autosource.sh
 
 set -a
 source $SCRIPTS_DIR/shared.sh
 set +a
 
+autosource
+
 APP_NAME=my-otel-demo
 
 title "Checking environment for $APP_NAME..."

diff --git a/scripts/rca-demo/shared.sh b/scripts/rca-demo/shared.sh
@@ -34,4 +34,20 @@ warn () {
 die () {
 	echo -e "${BRed}ERROR: $1${Color_Off}"
 	exit 1
+}
+
+autosource () {
+	SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
+	LOAD_ENV_FILE_PATH=$SCRIPTS_DIR/.env
+
+	if [ -n "${ENV_FILE_PATH}" ]; then
+		LOAD_ENV_FILE_PATH=$ENV_FILE_PATH
+	fi
+
+	if [ -f $LOAD_ENV_FILE_PATH ]; then
+		title "Sourcing environment variables from $LOAD_ENV_FILE_PATH"
+		source $LOAD_ENV_FILE_PATH
+	else
+		warn "Environment variables file not found at $LOAD_ENV_FILE_PATH"
+	fi
 }