fix: always retry curl invocations to surmount transient third-party failures

gaultier · ory-bot · commit 9301ce93ad94 · 2025-11-20T08:18:47.000Z
GitOrigin-RevId: b23ca94a4e1ba11367012a70a9e528b614f3ceb9
diff --git a/contrib/docs-code-samples/expand-api-display-access/00-create-tuples/curl.sh b/contrib/docs-code-samples/expand-api-display-access/00-create-tuples/curl.sh
@@ -18,6 +18,7 @@ files:/photos/mountains.jpg#access@(directories:/photos#access)' | \
   keto relation-tuple parse - --format json | \
     jq "[ .[] | { relation_tuple: . , action: \"insert\" } ]" -c | \
       curl -X PATCH --silent --fail \
+        --retry 7 --retry-connrefused \
         --data @- \
         http://127.0.0.1:4467/admin/relation-tuples
 
diff --git a/contrib/docs-code-samples/expand-api-display-access/01-expand-beach/curl.sh b/contrib/docs-code-samples/expand-api-display-access/01-expand-beach/curl.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "namespace=files" \
      --data-urlencode "relation=access" \
      --data-urlencode "object=/photos/beach.jpg" \
diff --git a/contrib/docs-code-samples/expand-api-display-access/99-cleanup/curl.sh b/contrib/docs-code-samples/expand-api-display-access/99-cleanup/curl.sh
@@ -5,17 +5,21 @@ export KETO_READ_REMOTE="127.0.0.1:4466"
 export KETO_WRITE_REMOTE="127.0.0.1:4467"
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "namespace=files" \
      http://127.0.0.1:4466/relation-tuples | \
   jq "[ .relation_tuples[] | { relation_tuple: . , action: \"delete\" } ]" -c | \
     curl -X PATCH --silent --fail \
+      --retry 7 --retry-connrefused \
       --data @- \
       http://127.0.0.1:4467/admin/relation-tuples
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "namespace=directories" \
      http://127.0.0.1:4466/relation-tuples | \
   jq "[ .relation_tuples[] | { relation_tuple: . , action: \"delete\" } ]" -c | \
     curl -X PATCH --silent --fail \
+      --retry 7 --retry-connrefused \
       --data @- \
       http://127.0.0.1:4467/admin/relation-tuples
diff --git a/contrib/docs-code-samples/list-api-display-objects/00-create-tuples/curl.sh b/contrib/docs-code-samples/list-api-display-objects/00-create-tuples/curl.sh
@@ -15,6 +15,7 @@ chats:coffee-break#member@Patrik' | \
   keto relation-tuple parse - --format json | \
     jq "[ .[] | { relation_tuple: . , action: \"insert\" } ]" -c | \
       curl -X PATCH --silent --fail \
+        --retry 7 --retry-connrefused \
         --data @- \
         http://127.0.0.1:4467/admin/relation-tuples
 
diff --git a/contrib/docs-code-samples/list-api-display-objects/01-list-PM/curl.sh b/contrib/docs-code-samples/list-api-display-objects/01-list-PM/curl.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "namespace=chats" \
      --data-urlencode "relation=member" \
      --data-urlencode "subject_id=PM" \
diff --git a/contrib/docs-code-samples/list-api-display-objects/02-list-coffee-break/curl.sh b/contrib/docs-code-samples/list-api-display-objects/02-list-coffee-break/curl.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "namespace=chats" \
      --data-urlencode "object=coffee-break" \
      --data-urlencode "relation=member" \
diff --git a/contrib/docs-code-samples/list-api-display-objects/99-cleanup/curl.sh b/contrib/docs-code-samples/list-api-display-objects/99-cleanup/curl.sh
@@ -5,9 +5,11 @@ export KETO_READ_REMOTE="127.0.0.1:4466"
 export KETO_WRITE_REMOTE="127.0.0.1:4467"
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "namespace=chats" \
      http://127.0.0.1:4466/relation-tuples | \
   jq "[ .relation_tuples[] | { relation_tuple: . , action: \"delete\" } ]" -c | \
     curl -X PATCH --silent --fail \
+      --retry 7 --retry-connrefused \
       --data @- \
       http://127.0.0.1:4467/admin/relation-tuples
diff --git a/contrib/docs-code-samples/simple-access-check-guide/00-write-direct-access/curl.sh b/contrib/docs-code-samples/simple-access-check-guide/00-write-direct-access/curl.sh
@@ -10,6 +10,7 @@ relationtuple='
 }'
 
 curl --fail --silent -X PUT \
+     --retry 7 --retry-connrefused \
      --data "$relationtuple" \
      http://127.0.0.1:4467/admin/relation-tuples > /dev/null \
   && echo "Successfully created tuple" \
diff --git a/contrib/docs-code-samples/simple-access-check-guide/01-check-direct-access/curl.sh b/contrib/docs-code-samples/simple-access-check-guide/01-check-direct-access/curl.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 curl -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "subject_id=john" \
      --data-urlencode "relation=decypher" \
      --data-urlencode "namespace=messages" \
diff --git a/contrib/docs-code-samples/simple-access-check-guide/99-cleanup/curl.sh b/contrib/docs-code-samples/simple-access-check-guide/99-cleanup/curl.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 curl -X DELETE -G --silent \
+     --retry 7 --retry-connrefused \
      --data-urlencode "subject_id=john" \
      --data-urlencode "relation=decypher" \
      --data-urlencode "namespace=messages" \
diff --git a/contrib/docs-code-samples/test.sh b/contrib/docs-code-samples/test.sh
@@ -29,11 +29,7 @@ for suite in */ ; do
     keto serve -c "$suite/keto.yml" &> "serve_$suite.log" &
     keto_server_pid=$!
 
-    until curl --output /dev/null --silent --fail http://127.0.0.1:4466/health/ready; do
-        printf '.'
-        sleep 0.2
-    done
-    echo
+    curl --retry 7 --retry-connrefused --output /dev/null --silent --fail http://127.0.0.1:4466/health/ready
 
     for main in "$suite"/*/main.go; do
         echo "Running $main"
diff --git a/install.sh b/install.sh
@@ -262,9 +262,9 @@ http_download_curl() {
   source_url=$2
   header=$3
   if [ -z "$header" ]; then
-    code=$(curl -w '%{http_code}' -sL -o "$local_file" "$source_url")
+    code=$(curl --retry 7 --retry-connrefused -w '%{http_code}' -sL -o "$local_file" "$source_url")
   else
-    code=$(curl -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url")
+    code=$(curl --retry 7 --retry-connrefused -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url")
   fi
   if [ "$code" != "200" ]; then
     log_debug "http_download_curl received HTTP status $code"
diff --git a/scripts/install-grype.sh b/scripts/install-grype.sh
@@ -17,4 +17,4 @@ if [[ "$("$BINDIR/$BINNAME" version)" == *"$GRYPE_VERSION"* ]]; then
     exit 0
 fi
 
-curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | bash -s -- -b "$BINDIR" "v$GRYPE_VERSION"
+curl --retry 7 --retry-connrefused -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | bash -s -- -b "$BINDIR" "v$GRYPE_VERSION"
diff --git a/scripts/install-helpers.sh b/scripts/install-helpers.sh
@@ -45,9 +45,9 @@ http_download_curl() {
 	source_url=$2
 	header=$3
 	if [ -z "$header" ]; then
-		code=$(curl -w '%{http_code}' -sL -o "$local_file" "$source_url")
+		code=$(curl --retry 7 --retry-connrefused -w '%{http_code}' -sL -o "$local_file" "$source_url")
 	else
-		code=$(curl -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url")
+		code=$(curl --retry 7 --retry-connrefused -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url")
 	fi
 	if [ "$code" != "200" ]; then
 		echo "http_download_curl received HTTP status $code"
diff --git a/scripts/install-licenses.sh b/scripts/install-licenses.sh
@@ -17,4 +17,4 @@ if [[ "$("$BINDIR/$BINNAME" version)" == *"$LICENCES_VERSION"* ]]; then
     exit 0
 fi
 
-curl -sSfL https://raw.githubusercontent.com/ory/ci/master/licenses/install | bash -s -- -b "$BINDIR" licences "v$LICENCES_VERSION"
+curl --retry 7 --retry-connrefused -sSfL https://raw.githubusercontent.com/ory/ci/master/licenses/install | bash -s -- -b "$BINDIR" licences "v$LICENCES_VERSION"
diff --git a/scripts/install-ory.sh b/scripts/install-ory.sh
@@ -17,4 +17,4 @@ if [[ "$("$BINDIR/$BINNAME" version)" == *"$ORY_VERSION"* ]]; then
     exit 0
 fi
 
-curl -sSfL https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b "$BINDIR" ory "v$ORY_VERSION"
+curl --retry 7 --retry-connrefused -sSfL https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b "$BINDIR" ory "v$ORY_VERSION"
diff --git a/scripts/install-trivy.sh b/scripts/install-trivy.sh
@@ -17,4 +17,4 @@ if [[ "$("$BINDIR/$BINNAME" version)" == *"$TRIVY_VERSION"* ]]; then
     exit 0
 fi
 
-curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | bash -s -- -b "$BINDIR" "v$TRIVY_VERSION"
+curl --retry 7 --retry-connrefused -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | bash -s -- -b "$BINDIR" "v$TRIVY_VERSION"
diff --git a/scripts/single-table-migration-e2e.sh b/scripts/single-table-migration-e2e.sh
@@ -3,7 +3,7 @@ set -euxo pipefail
 
 rm migrate_e2e.sqlite || true
 
-bash <(curl https://raw.githubusercontent.com/ory/keto/master/install.sh) -b . v0.6.0-alpha.3
+bash <(curl --retry 7 --retry-connrefused https://raw.githubusercontent.com/ory/keto/master/install.sh) -b . v0.6.0-alpha.3
 
 export DSN="sqlite://./migrate_e2e.sqlite?_fk=true"
 export KETO_READ_REMOTE="127.0.0.1:4466"
