Add timeout to client registration (#444)

Author: c-w

docker/integtest/1-register-client.sh

@@ -7,6 +7,25 @@ mkdir -p "${out_dir}"
 # shellcheck disable=SC1090
 . "${scriptdir}/utils.sh"
 
+readonly polling_interval_seconds=2
+readonly max_retries=150
+
+wait_for_client() {
+  local client="$1"
+  local i
+
+  for i in $(seq 1 "${max_retries}"); do
+    if curl -fs -u "${REGISTRATION_CREDENTIALS}" "http://nginx:8888/api/email/register/developer${client}.lokole.ca" | tee "${out_dir}/register${client}.json"; then
+      log "Client ${client} is registered"
+      return
+    fi
+    log "Waiting for client ${client} registration (${i}/${max_retries})"
+    sleep "${polling_interval_seconds}"
+  done
+
+  exit 1
+}
+
 # workflow 3: register a new client called "developer"
 # normally this endpoint would be called during a new lokole device setup
 curl -fs \
@@ -15,10 +34,7 @@ curl -fs \
   -d '{"domain":"developer1.lokole.ca"}' \
   "http://nginx:8888/api/email/register/"
 
-while ! curl -fs -u "${REGISTRATION_CREDENTIALS}" "http://nginx:8888/api/email/register/developer1.lokole.ca" | tee "${out_dir}/register1.json"; do
-  log "Waiting for client 1 registration"
-  sleep 1s
-done
+wait_for_client 1
 
 # registering a client with bad credentials should fail
 if curl -fs \
@@ -35,10 +51,7 @@ curl -fs \
   -d '{"domain":"developer2.lokole.ca"}' \
   "http://nginx:8888/api/email/register/"
 
-while ! curl -fs -u "${REGISTRATION_CREDENTIALS}" "http://nginx:8888/api/email/register/developer2.lokole.ca" | tee "${out_dir}/register2.json"; do
-  log "Waiting for client 2 registration"
-  sleep 1s
-done
+wait_for_client 2
 
 # after creating a client, creating the same one again should fail but we should be able to delete it
 curl -fs \
@@ -47,10 +60,7 @@ curl -fs \
   -d '{"domain":"developer3.lokole.ca"}' \
   "http://nginx:8888/api/email/register/"
 
-while ! curl -fs -u "${REGISTRATION_CREDENTIALS}" "http://nginx:8888/api/email/register/developer3.lokole.ca"; do
-  log "Waiting for client 3 registration"
-  sleep 1s
-done
+wait_for_client 3
 
 if curl -fs \
   -H "Content-Type: application/json" \