Update multi tenancy_Integration.yml

Author: vibhutikumar07

.github/workflows/multi tenancy_Integration.yml

@@ -59,36 +59,36 @@ jobs:
             -u ${{ secrets.CF_USER }} \
             -p ${{ secrets.CF_PASSWORD }} \
             -o ${{ secrets.CF_ORG }} \
-            -s ${{ secrets.CF_SPACE }} > /dev/null
+            -s ${{ secrets.CF_SPACE }} > /dev/null 2>&1
           echo -e "\033[32m✔️ Login successful!\033[0m"
 
       - name: Fetch and Escape Client Details for Single Tenant
         id: fetch_credentials
         run: |
           echo -e "\033[36m🚀 Fetching Client Details for Single Tenant...\033[0m"
-          service_instance_guid=$(cf service demoappjava-public-uaa --guid) > /dev/null
+          service_instance_guid=$(cf service demoappjava-public-uaa --guid)
           if [ -z "$service_instance_guid" ]; then
             echo -e "\033[31m❌ Error: Unable to retrieve service instance GUID\033[0m"
             exit 1
           fi
           
-          bindings_response=$(cf curl "/v3/service_credential_bindings?service_instance_guids=${service_instance_guid}") > /dev/null
-          binding_guid=$(echo $bindings_response | jq -r '.resources[0].guid') > /dev/null
+          bindings_response=$(cf curl "/v3/service_credential_bindings?service_instance_guids=${service_instance_guid}")
+          binding_guid=$(echo $bindings_response | jq -r '.resources[0].guid')
           if [ -z "$binding_guid" ]; then
             echo -e "\033[31m❌ Error: Unable to retrieve binding GUID\033[0m"
             exit 1
           fi
           
-          binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details") > /dev/null
+          binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
 
-          clientSecret=$(echo "$binding_details" | jq -r '.credentials.clientsecret') > /dev/null
+          clientSecret=$(echo "$binding_details" | jq -r '.credentials.clientsecret')
           if [ -z "$clientSecret" ] || [ "$clientSecret" == "null" ]; then
             echo -e "\033[31m❌ Error: clientSecret is not set or is null\033[0m"
             exit 1
           fi
-          escapedClientSecret=$(echo "$clientSecret" | sed 's/\$/\\$/g') > /dev/null
+          escapedClientSecret=$(echo "$clientSecret" | sed 's/\$/\\$/g')
 
-          clientID=$(echo "$binding_details" | jq -r '.credentials.clientid') > /dev/null
+          clientID=$(echo "$binding_details" | jq -r '.credentials.clientid')
           if [ -z "$clientID" ] || [ "$clientID" == "null" ]; then
             echo -e "\033[31m❌ Error: clientID is not set or is null\033[0m"
             exit 1
@@ -102,29 +102,29 @@ jobs:
         id: fetch_credentials_mt
         run: |
             echo -e "\033[36m🚀 Fetching Client Details for Multi Tenant...\033[0m"
-            service_instance_guid=$(cf service bookshop-mt-uaa --guid) > /dev/null
+            service_instance_guid=$(cf service bookshop-mt-uaa --guid)
             if [ -z "$service_instance_guid" ]; then
               echo -e "\033[31m❌ Error: Unable to retrieve service instance GUID\033[0m"
               exit 1
             fi
             
-            bindings_response=$(cf curl "/v3/service_credential_bindings?service_instance_guids=${service_instance_guid}") > /dev/null
-            binding_guid=$(echo $bindings_response | jq -r '.resources[0].guid') > /dev/null
+            bindings_response=$(cf curl "/v3/service_credential_bindings?service_instance_guids=${service_instance_guid}")
+            binding_guid=$(echo $bindings_response | jq -r '.resources[0].guid')
             if [ -z "$binding_guid" ]; then
               echo -e "\033[31m❌ Error: Unable to retrieve binding GUID\033[0m"
               exit 1
             fi
             
-            binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details") > /dev/null
+            binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
 
-            clientSecret_mt=$(echo "$binding_details" | jq -r '.credentials.clientsecret') > /dev/null
+            clientSecret_mt=$(echo "$binding_details" | jq -r '.credentials.clientsecret')
             if [ -z "$clientSecret_mt" ] || [ "$clientSecret_mt" == "null" ]; then
               echo -e "\033[31m❌ Error: clientSecret_mt is not set or is null\033[0m"
               exit 1
             fi
-            escapedClientSecret_mt=$(echo "$clientSecret_mt" | sed 's/\$/\\$/g') > /dev/null
+            escapedClientSecret_mt=$(echo "$clientSecret_mt" | sed 's/\$/\\$/g')
 
-            clientID_mt=$(echo "$binding_details" | jq -r '.credentials.clientid') > /dev/null
+            clientID_mt=$(echo "$binding_details" | jq -r '.credentials.clientid')
             if [ -z "$clientID_mt" ] || [ "$clientID_mt" == "null" ]; then
               echo -e "\033[31m❌ Error: clientID_mt is not set or is null\033[0m"
               exit 1
@@ -143,22 +143,22 @@ jobs:
         run: |
           echo -e "\033[36m🧪 Running Integration Tests...\033[0m"
           set -e
+
+          # Assign variables but suppress printing in terminal output
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
           appUrl="${{ secrets.CF_ORG }}-${{ secrets.CF_SPACE }}-demoappjava-srv.cfapps.eu12.hana.ondemand.com"
           appUrlMT="${{ secrets.CF_ORG }}-${{ secrets.CF_SPACE }}-bookshop-mt-srv.cfapps.eu12.hana.ondemand.com"
           authUrl="${{ secrets.CAPAUTH_URL }}"
           authUrlMT1="${{ secrets.AUTHURLMT1 }}"
           authUrlMT2="${{ secrets.AUTHURLMT2 }}"
-          username="${{ secrets.CF_USER }}"
-          password="${{ secrets.CF_PASSWORD }}"
-          noSDMRoleUsername="${{ secrets.NOSDMROLEUSERNAME }}"
-          noSDMRoleUserPassword="${{ secrets.NOSDMROLEUSERPASSWORD }}"
-
-          # Using clientID and clientSecret variables for operation but masking their visibility
           clientID="${{ env.CLIENT_ID }}"
           clientSecret="${{ env.CLIENT_SECRET }}"
           clientIDMT="${{ env.CLIENT_ID_MT }}"
           clientSecretMT="${{ env.CLIENT_SECRET_MT }}"
+          username="${{ secrets.CF_USER }}"
+          password="${{ secrets.CF_PASSWORD }}"
+          noSDMRoleUsername="${{ secrets.NOSDMROLEUSERNAME }}"
+          noSDMRoleUserPassword="${{ secrets.NOSDMROLEUSERPASSWORD }}"
 
           # Check if secrets and env variables are set before using them
           for var in appUrl appUrlMT authUrl authUrlMT1 authUrlMT2 clientID clientSecret clientIDMT clientSecretMT username password noSDMRoleUsername noSDMRoleUserPassword; do