fix multitenant

Author: akgarg06

.github/workflows/multi tenancy_Integration.yml

@@ -179,6 +179,8 @@ jobs:
           CMIS_URL="${{ secrets.CMIS_URL }}"
           cmisClientID="$CMIS_CLIENT_ID"
           cmisClientSecret="$CMIS_CLIENT_SECRET"
+          defaultRepositoryID="${{ secrets.DEFAULTREPOSITORYID }}"
+          defaultRepositoryIDMT="${{ secrets.DEFAULTREPOSITORYIDMT }}"
 
           echo "::add-mask::$clientSecret"
           echo "::add-mask::$clientID"
@@ -226,6 +228,8 @@ jobs:
           CMIS_URL=$CMIS_URL
           cmisClientID=$cmisClientID
           cmisClientSecret=$cmisClientSecret
+          defaultRepositoryID=$defaultRepositoryID
+          defaultRepositoryIDMT=$defaultRepositoryIDMT
           EOL
           echo "✅ Credentials file prepared!"
 

sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh

@@ -6,6 +6,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"

sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh

@@ -6,6 +6,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"

sdm/src/test/java/integration/com/sap/cds/sdm/utils/create.sh

@@ -20,6 +20,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"

sdm/src/test/java/integration/com/sap/cds/sdm/utils/delete.sh

@@ -21,6 +21,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"

sdm/src/test/java/integration/com/sap/cds/sdm/utils/get-metadata.sh

@@ -21,6 +21,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"

sdm/src/test/java/integration/com/sap/cds/sdm/utils/get-object-id.sh

@@ -25,6 +25,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"
@@ -35,23 +36,14 @@ load_props() {
   done < "$1"
 }
 
-echo "[DEBUG] SCRIPT_DIR=$SCRIPT_DIR"
-echo "[DEBUG] CONFIG_FILE=$CONFIG_FILE"
-
 if [[ ! -f "$CONFIG_FILE" ]]; then
   echo "ERROR: Config file not found at $CONFIG_FILE"
   exit 1
 fi
-echo "[DEBUG] Config file found, loading properties..."
-load_props "$CONFIG_FILE" || {
-  echo "ERROR: load_props failed with exit code $?"
-  exit 1
-}
+load_props "$CONFIG_FILE"
 defaultRepositoryID="${SDM_REPOSITORY_ID:-$defaultRepositoryID}"
 authUrl="${SDM_AUTH_URL:-$authUrl}"
 CMIS_URL="${CMIS_URL%/}/"
-echo "[DEBUG] Properties loaded. defaultRepositoryID=$defaultRepositoryID"
-echo "[DEBUG] CMIS_URL=$CMIS_URL"
 
 # --- Validate positional parameters ---
 if [[ $# -lt 1 || $# -gt 3 ]]; then
@@ -62,7 +54,6 @@ fi
 CMIS_NAME="$1"
 PARENT_FOLDER_ID="${2:-}"
 CMIS_TYPE="${3:-cmis:folder}"
-echo "[DEBUG] CMIS_NAME=$CMIS_NAME, PARENT_FOLDER_ID=$PARENT_FOLDER_ID, CMIS_TYPE=$CMIS_TYPE"
 
 # --- Validate required config variables ---
 for var in CMIS_URL defaultRepositoryID authUrl cmisClientID cmisClientSecret username password; do
@@ -71,20 +62,14 @@ for var in CMIS_URL defaultRepositoryID authUrl cmisClientID cmisClientSecret us
     exit 1
   fi
 done
-echo "[DEBUG] All required config variables validated"
 
 # --- Obtain OAuth2 access token (password grant) ---
-echo "[DEBUG] Requesting token from: ${authUrl}/oauth/token"
 TOKEN_RESPONSE=$(curl -s -X POST "${authUrl}/oauth/token" \
   --data-urlencode "grant_type=password" \
   --data-urlencode "client_id=${cmisClientID}" \
   --data-urlencode "client_secret=${cmisClientSecret}" \
   --data-urlencode "username=${username}" \
-  --data-urlencode "password=${password}" 2>&1) || {
-  echo "ERROR: curl for token failed with exit code $?"
-  echo "Response: $TOKEN_RESPONSE"
-  exit 1
-}
+  --data-urlencode "password=${password}")
 
 ACCESS_TOKEN=$(echo "$TOKEN_RESPONSE" \
   | grep -o '"access_token":"[^"]*"' \
@@ -95,32 +80,24 @@ if [[ -z "$ACCESS_TOKEN" ]]; then
   echo "Token endpoint response: $TOKEN_RESPONSE"
   exit 1
 fi
-echo "[DEBUG] Access token obtained (length=${#ACCESS_TOKEN})"
 
 # --- Execute CMIS query to find the folder by name ---
 QUERY_URL="${CMIS_URL}browser/${defaultRepositoryID}"
-echo "[DEBUG] QUERY_URL=$QUERY_URL"
 
 if [[ -n "${PARENT_FOLDER_ID}" ]]; then
   CMIS_QUERY="SELECT cmis:objectId FROM ${CMIS_TYPE} WHERE cmis:name = '${CMIS_NAME}' AND IN_FOLDER('${PARENT_FOLDER_ID}')"
 else
   CMIS_QUERY="SELECT cmis:objectId FROM ${CMIS_TYPE} WHERE cmis:name = '${CMIS_NAME}'"
 fi
-echo "[DEBUG] CMIS_QUERY=$CMIS_QUERY"
 RESPONSE=$(curl -s -w "\n%{http_code}" \
   -X GET "${QUERY_URL}" \
   -H "Authorization: Bearer ${ACCESS_TOKEN}" \
   -G \
   --data-urlencode "cmisselector=query" \
-  --data-urlencode "q=${CMIS_QUERY}" 2>&1) || {
-  echo "ERROR: curl for CMIS query failed with exit code $?"
-  echo "Response: $RESPONSE"
-  exit 1
-}
+  --data-urlencode "q=${CMIS_QUERY}")
 
 HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
 BODY=$(echo "$RESPONSE" | sed '$d')
-echo "[DEBUG] CMIS query HTTP_CODE=$HTTP_CODE"
 
 if [[ "$HTTP_CODE" != "200" ]]; then
   echo "ERROR: CMIS query failed (HTTP ${HTTP_CODE})."

sdm/src/test/java/integration/com/sap/cds/sdm/utils/read.sh

@@ -20,6 +20,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file without shell expansion of values
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"

sdm/src/test/java/integration/com/sap/cds/sdm/utils/sdm-repo-manage.sh

@@ -26,6 +26,7 @@ CONFIG_FILE="${SCRIPT_DIR}/../../../../../../../resources/credentials.properties
 
 # Load key=value pairs from .properties file
 load_props() {
+  local key val
   while IFS= read -r line || [[ -n "$line" ]]; do
     [[ "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
     key="${line%%=*}"