Skip to content

Commit 46f74ef

Browse files
committed
Update singleTenant_integration_test.yml
1 parent 31d2234 commit 46f74ef

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/singleTenant_integration_test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ jobs:
129129
echo "❌ Error: Unable to retrieve SDM binding GUID for demoappjava-srv"; exit 1;
130130
fi
131131
binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
132-
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.clientsecret')
132+
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.uaa.clientsecret // .credentials.clientsecret // empty')
133133
if [ -z "$cmis_client_secret" ] || [ "$cmis_client_secret" == "null" ]; then
134134
echo "❌ Error: SDM clientsecret is not set or is null"; exit 1;
135135
fi
136136
escapedCmisClientSecret=$(echo "$cmis_client_secret" | sed 's/\$/\\$/g')
137137
echo "::add-mask::$escapedCmisClientSecret"
138-
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.clientid')
138+
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.uaa.clientid // .credentials.clientid // empty')
139139
if [ -z "$cmis_client_id" ] || [ "$cmis_client_id" == "null" ]; then
140140
echo "❌ Error: SDM clientid is not set or is null"; exit 1;
141141
fi
@@ -398,13 +398,13 @@ jobs:
398398
echo "❌ Error: Unable to retrieve SDM binding GUID for demoappjava-srv"; exit 1;
399399
fi
400400
binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
401-
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.clientsecret')
401+
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.uaa.clientsecret // .credentials.clientsecret // empty')
402402
if [ -z "$cmis_client_secret" ] || [ "$cmis_client_secret" == "null" ]; then
403403
echo "❌ Error: SDM clientsecret is not set or is null"; exit 1;
404404
fi
405405
escapedCmisClientSecret=$(echo "$cmis_client_secret" | sed 's/\$/\\$/g')
406406
echo "::add-mask::$escapedCmisClientSecret"
407-
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.clientid')
407+
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.uaa.clientid // .credentials.clientid // empty')
408408
if [ -z "$cmis_client_id" ] || [ "$cmis_client_id" == "null" ]; then
409409
echo "❌ Error: SDM clientid is not set or is null"; exit 1;
410410
fi
@@ -632,13 +632,13 @@ jobs:
632632
echo "❌ Error: Unable to retrieve SDM binding GUID for demoappjava-srv"; exit 1;
633633
fi
634634
binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
635-
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.clientsecret')
635+
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.uaa.clientsecret // .credentials.clientsecret // empty')
636636
if [ -z "$cmis_client_secret" ] || [ "$cmis_client_secret" == "null" ]; then
637637
echo "❌ Error: SDM clientsecret is not set or is null"; exit 1;
638638
fi
639639
escapedCmisClientSecret=$(echo "$cmis_client_secret" | sed 's/\$/\\$/g')
640640
echo "::add-mask::$escapedCmisClientSecret"
641-
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.clientid')
641+
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.uaa.clientid // .credentials.clientid // empty')
642642
if [ -z "$cmis_client_id" ] || [ "$cmis_client_id" == "null" ]; then
643643
echo "❌ Error: SDM clientid is not set or is null"; exit 1;
644644
fi
@@ -870,13 +870,13 @@ jobs:
870870
echo "❌ Error: Unable to retrieve SDM binding GUID for demoappjava-srv"; exit 1;
871871
fi
872872
binding_details=$(cf curl "/v3/service_credential_bindings/${binding_guid}/details")
873-
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.clientsecret')
873+
cmis_client_secret=$(echo "$binding_details" | jq -r '.credentials.uaa.clientsecret // .credentials.clientsecret // empty')
874874
if [ -z "$cmis_client_secret" ] || [ "$cmis_client_secret" == "null" ]; then
875875
echo "❌ Error: SDM clientsecret is not set or is null"; exit 1;
876876
fi
877877
escapedCmisClientSecret=$(echo "$cmis_client_secret" | sed 's/\$/\\$/g')
878878
echo "::add-mask::$escapedCmisClientSecret"
879-
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.clientid')
879+
cmis_client_id=$(echo "$binding_details" | jq -r '.credentials.uaa.clientid // .credentials.clientid // empty')
880880
if [ -z "$cmis_client_id" ] || [ "$cmis_client_id" == "null" ]; then
881881
echo "❌ Error: SDM clientid is not set or is null"; exit 1;
882882
fi

0 commit comments

Comments
 (0)