Merge pull request #7 from zazuko/body-cleanup

zazuko · Feb 7, 2025 · 79c2a69 · 79c2a69
2 parents c7a412c + b16fa6b
commit 79c2a69
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/.changeset/cold-bikes-visit.md b/.changeset/cold-bikes-visit.md
@@ -0,0 +1,5 @@
+---
+"api-tuner": patch
+---
+
+Exit code was '0' when the eye process fail
diff --git a/.changeset/flat-snails-love.md b/.changeset/flat-snails-love.md
@@ -0,0 +1,5 @@
+---
+"api-tuner": patch
+---
+
+Temporary request body file was not removed
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,11 @@ jobs:
           node-version: lts/*
       - uses: fabasoad/setup-prolog-action@v1
       - run: npm ci
+      - run: docker compose up -d
+      - run: npx wait-on http-get://localhost:1080/example.com
       - run: npm test
+        shell: bash
+      - run: if [[ `git status --porcelain` ]]; then git status --porcelain && exit 1; fi
   lint:
     runs-on: ubuntu-latest
     steps:

diff --git a/bin/tuner.sh b/bin/tuner.sh
@@ -88,4 +88,5 @@ for path in "${PATHS[@]}"; do
   cat "$path" >> "$MERGED"
 done
 
+set -o pipefail
 $eye $ARGS "${SCRIPT_PATH}"/../rules/*.n3 "${MERGED}" | $SUMMARY
diff --git a/rules/requests.n3 b/rules/requests.n3
@@ -61,7 +61,13 @@ prefix earl: <http://www.w3.org/ns/earl#>
     ) string:concatenation ?command .
 
     ?command^tuner:trace .
-    ?command!e:exec .
+    {
+      ?command!e:exec .
+    } log:callWithCleanup {
+      {
+        ( { ?requestBodyFile log:rawType log:Literal } { ?requestBodyFile!file:rm } true ) log:ifThenElseIn [] .
+      } log:callWithCleanup true .
+    } .
 
     (
       "node " "lib/merge-curl-output.js"!file:libPath " "
@@ -72,9 +78,6 @@ prefix earl: <http://www.w3.org/ns/earl#>
     ("file://" ?responseFile)!string:concatenation^log:uri log:semantics ?res .
     ?res^tuner:trace .
   } log:callWithCleanup {
-    {
-      ( { ?requestBodyFile log:rawType log:Literal } { ?requestBodyFile!file:rm } true ) log:ifThenElseIn [] .
-    } log:callWithCleanup true .
     { ?responseHeadersFile!file:rm } log:callWithCleanup true .
     { ?responseBodyFile!file:rm } log:callWithCleanup true .
     { ?responseFile!file:rm } log:callWithCleanup true .

diff --git a/tests/failed-requests.n3 b/tests/failed-requests.n3
@@ -24,7 +24,7 @@ prefix e: <http://eulersharp.sourceforge.net/2003/03swap/log-rules#>
       true log:equalTo false .
     }
     {
-      "if [[ `git status --porcelain` ]]; then exit 1; fi" e:exec 0 .
+      "if git status --porcelain | grep .; then exit 1; fi" e:exec 0 .
     }
   ) log:ifThenElseIn [] .
 } => {