Update multi tenancy_Integration.yml

Author: vibhutikumar07

.github/workflows/multi tenancy_Integration.yml

@@ -81,14 +81,14 @@ jobs:
           fi
           
           binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
-          
+
           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')
-          
+
           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"
@@ -98,6 +98,8 @@ jobs:
           echo "::set-output name=CLIENT_SECRET::$escapedClientSecret"
           echo "::set-output name=CLIENT_ID::$clientID"
           echo -e "\033[32m✔️ Client Details fetched successfully!\033[0m"
+          echo -e "\033[34mClientID: ${clientID:0:3}****${clientID: -3}\033[0m"
+          echo -e "\033[34mClientSecret: ${clientSecret:0:3}****${clientSecret: -3}\033[0m"
 
       - name: Fetch and Escape Client Details for multi tenant
         id: fetch_credentials_mt
@@ -117,14 +119,14 @@ jobs:
             fi
             
             binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
-            
+
             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')
-            
+
             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"
@@ -134,6 +136,8 @@ jobs:
             echo "::set-output name=CLIENT_SECRET_MT::$escapedClientSecret_mt"
             echo "::set-output name=CLIENT_ID_MT::$clientID_mt"
             echo -e "\033[32m✔️ Multi Tenant Client Details fetched successfully!\033[0m"
+            echo -e "\033[34mClientID_MT: ${clientID_mt:0:3}****${clientID_mt: -3}\033[0m"
+            echo -e "\033[34mClientSecret_MT: ${clientSecret_mt:0:3}****${clientSecret_mt: -3}\033[0m"
 
       - name: Run integration tests
         env:
@@ -150,17 +154,17 @@ jobs:
           authUrl="${{ secrets.CAPAUTH_URL }}"
           authUrlMT1="${{ secrets.AUTHURLMT1 }}"
           authUrlMT2="${{ secrets.AUTHURLMT2 }}" 
-          clientID="<hidden>"
-          clientSecret="<hidden>"
-          clientIDMT="<hidden>"
-          clientSecretMT="<hidden>"
+          clientID="${{ env.CLIENT_ID }}"
+          clientSecret="${{ env.CLIENT_SECRET }}"
+          clientIDMT="${{ env.CLIENT_ID_MT }}"
+          clientSecretMT="${{ env.CLIENT_SECRET_MT }}"
           username="${{ secrets.CF_USER }}"
-          password="<hidden>"
+          password="${{ secrets.CF_PASSWORD }}"
           noSDMRoleUsername="${{ secrets.NOSDMROLEUSERNAME }}"
-          noSDMRoleUserPassword="<hidden>"
+          noSDMRoleUserPassword="${{ secrets.NOSDMROLEUSERPASSWORD }}"
           
           # Check if variables are set before using them
-          for var in appUrl appUrlMT authUrl authUrlMT1 authUrlMT2 username password noSDMRoleUsername noSDMRoleUserPassword; do
+          for var in appUrl appUrlMT authUrl authUrlMT1 authUrlMT2 clientID clientSecret clientIDMT clientSecretMT username password noSDMRoleUsername noSDMRoleUserPassword; do
             if [ -z "${!var}" ]; then
               echo -e "\033[31m❌ Error: ${var} is not set\033[0m"
               exit 1
@@ -184,15 +188,14 @@ jobs:
           EOL
 
           # Display properties file without sensitive information
-          echo -e "\033[34m📜 Properties File:\033[0m"
-          cat "$PROPERTIES_FILE" | grep -v -e "clientID=" -e "clientSecret=" -e "password=" -e "clientIDMT=" -e "clientSecretMT=" -e "noSDMRoleUserPassword="
-          
-          # Run Maven integration tests
+          echo -e "\033[34m📜 Properties File (Masked):\033[0m"
+          cat "$PROPERTIES_FILE" | sed -e 's/=\w\+/=****/g' -e 's/=/=/'
 
+          # Run Maven integration tests
           echo -e "\033[34m🧪 Running Maven tests for Multi Tenancy...\033[0m"
           mvn clean verify -P integration-tests -DtokenFlow=namedUser -DtenancyModel=multi -Dtenant=TENANT1 -DskipUnitTests || { echo -e "\033[31m❌ Maven tests failed for Named User Flow (Multi Tenancy, Tenant 1)\033[0m"; exit 1; }
+          # Uncomment these lines when needed for additional tests
           # mvn clean verify -P integration-tests -DtokenFlow=technicalUser -DtenancyModel=multi -Dtenant=TENANT1 -DskipUnitTests || { echo -e "\033[31m❌ Maven tests failed for Technical User Flow (Multi Tenancy, Tenant 1)\033[0m"; exit 1; }
           # mvn clean verify -P integration-tests -DtokenFlow=namedUser -DtenancyModel=multi -Dtenant=TENANT2 -DskipUnitTests || { echo -e "\033[31m❌ Maven tests failed for Named User Flow (Multi Tenancy, Tenant 2)\033[0m"; exit 1; }
           # mvn clean verify -P integration-tests -DtokenFlow=technicalUser -DtenancyModel=multi -Dtenant=TENANT2 -DskipUnitTests || { echo -e "\033[31m❌ Maven tests failed for Technical User Flow (Multi Tenancy, Tenant 2)\033[0m"; exit 1; }
-
           echo -e "\033[32m✔️ Integration tests completed successfully!\033[0m"