Update script

wso2 · Nov 24, 2024 · 9a3091c · 9a3091c
1 parent e96c0cb
commit 9a3091c
Show file tree

Hide file tree

Showing 14 changed files with 280 additions and 146 deletions.
diff --git a/...on/dataservice-hosting-tests/tests-integration/tests/src/test/resources/bin/integrator.sh b/...on/dataservice-hosting-tests/tests-integration/tests/src/test/resources/bin/integrator.sh
@@ -149,14 +149,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -186,11 +192,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then

diff --git a/integration/mediation-tests/tests-mediator-1/src/test/resources/bin/integrator.sh b/integration/mediation-tests/tests-mediator-1/src/test/resources/bin/integrator.sh
@@ -149,14 +149,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -186,11 +192,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then

diff --git a/integration/mediation-tests/tests-mediator-2/src/test/resources/bin/integrator.sh b/integration/mediation-tests/tests-mediator-2/src/test/resources/bin/integrator.sh
@@ -149,14 +149,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -186,11 +192,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then

diff --git a/...ion-tests/tests-other/src/test/resources/artifacts/ESB/serviceCatalog/micro-integrator.sh b/...ion-tests/tests-other/src/test/resources/artifacts/ESB/serviceCatalog/micro-integrator.sh
@@ -166,11 +166,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then

diff --git a/integration/mediation-tests/tests-patches-with-smb2/src/test/resources/bin/integrator.sh b/integration/mediation-tests/tests-patches-with-smb2/src/test/resources/bin/integrator.sh
@@ -149,14 +149,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -186,11 +192,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then

diff --git a/...src/test/resources/artifacts/ESB/passthru/transport/enableCorrelation/micro-integrator.sh b/...src/test/resources/artifacts/ESB/passthru/transport/enableCorrelation/micro-integrator.sh
@@ -131,14 +131,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -166,11 +172,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then

diff --git a/...on/mediation-tests/tests-patches/src/test/resources/artifacts/ESB/vfs/micro-integrator.sh b/...on/mediation-tests/tests-patches/src/test/resources/artifacts/ESB/vfs/micro-integrator.sh
@@ -131,14 +131,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -169,11 +175,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$ARGUMENT" = "car" ]; then

diff --git a/integration/mediation-tests/tests-patches/src/test/resources/bin/integrator.sh b/integration/mediation-tests/tests-patches/src/test/resources/bin/integrator.sh
@@ -148,14 +148,20 @@ export_env_file() {
 
   # Read the .env file and export each variable to the environment
   while IFS='=' read -r key value; do
-    # Ignore lines starting with '#' (comments) or empty lines
-    if [ ! "$key" =~ ^# ] && [ "$key" != "" ]; then
-      # Trim surrounding whitespace from key and value
-      key=$(echo "$key" | xargs)
-      value=$(echo "$value" | xargs)
-      # Export the key-value pair to the environment
-      export "$key=$value"
-    fi
+      # Ignore lines starting with '#' (comments) or empty lines
+      case "$key" in
+          \#*|"")
+              # Skip comments or empty lines
+              continue
+              ;;
+          *)
+              # Trim surrounding whitespace from key and value
+              key=$(echo "$key" | xargs)
+              value=$(echo "$value" | xargs)
+              # Export the key-value pair to the environment
+              export "$key=$value"
+              ;;
+      esac
   done < "$file_path"
 
   echo "Environment variables loaded from $file_path."
@@ -185,11 +191,15 @@ do
         args="$args $c"
     fi
     # Check if the argument starts with --env-file=
-    if [ "$c" == --env-file=* ]; then
-        # Extract the file path from the argument
+    case "$c" in
+      --env-file=*)
         file_path="${c#--env-file=}"
         export_env_file "$file_path"
-    fi
+        ;;
+      *)
+        continue
+        ;;
+    esac
 done
 
 if [ "$CMD" = "--debug" ]; then