From dd12fc568a9cc5d05ae7ca0d0ae8795d16f11d03 Mon Sep 17 00:00:00 2001 From: cason Date: Thu, 7 Nov 2024 17:15:40 -0500 Subject: [PATCH] feat: changed grep to jq --- .github/workflows/check_smoke_tests.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check_smoke_tests.yml b/.github/workflows/check_smoke_tests.yml index 16f9137c..9489c807 100644 --- a/.github/workflows/check_smoke_tests.yml +++ b/.github/workflows/check_smoke_tests.yml @@ -18,11 +18,6 @@ jobs: POSTGRES_PASSWORD: pw ports: - 5432:5432 - # options: - # --health-cmd pg_isready - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 steps: - name: Check out repository @@ -67,17 +62,17 @@ jobs: -H "Content-Type: application/json") echo "Response: $RESPONSE_1" - echo "$RESPONSE_1" | grep -q '"is_match":\s*false' + echo "$RESPONSE_1" | jq -e '.is_match == false' - PERSON_REFERENCE_ID=$(echo "$RESPONSE_1" | grep -oP '"person_reference_id":"\K[^"]+') + PERSON_REFERENCE_ID=$(echo "$RESPONSE_1" | jq -r '.person_reference_id') RESPONSE_2=$(curl -s -X POST http://localhost:8080/link \ -d "$JSON_BODY_1" \ -H "Content-Type: application/json") echo "Response: $RESPONSE_2" - echo "$RESPONSE_2" | grep -q '"is_match":\s*true' - echo "$RESPONSE_2" | grep -q "\"person_reference_id\":\"$PERSON_REFERENCE_ID\"" + echo "$RESPONSE_2" | jq -e '.is_match == true' + echo "$RESPONSE_2" | jq -e --arg id "$PERSON_REFERENCE_ID" '.person_reference_id == $id' #enhanced tests RESPONSE_3=$(curl -s -X POST http://localhost:8080/link \ @@ -85,17 +80,17 @@ jobs: -H "Content-Type: application/json") echo "Response: $RESPONSE_3" - echo "$RESPONSE_3" | grep -q '"is_match":\s*false' + echo "$RESPONSE_3" | jq -e '.is_match == false' - PERSON_REFERENCE_ID=$(echo "$RESPONSE_3" | grep -oP '"person_reference_id":"\K[^"]+') + PERSON_REFERENCE_ID=$(echo "$RESPONSE_3" | jq -r '.person_reference_id') RESPONSE_4=$(curl -s -X POST http://localhost:8080/link \ -d "$JSON_BODY_2" \ -H "Content-Type: application/json") echo "Response: $RESPONSE_4" - echo "$RESPONSE_4" | grep -q '"is_match":\s*true' - echo "$RESPONSE_4" | grep -q "\"person_reference_id\":\"$PERSON_REFERENCE_ID\"" + echo "$RESPONSE_4" | jq -e '.is_match == true' + echo "$RESPONSE_4" | jq -e --arg id "$PERSON_REFERENCE_ID" '.person_reference_id == $id' #invalid tests RESPONSE_5=$(curl -s -X POST http://localhost:8080/link \