fix(integration): migrate wget-style curl syntax for Debian compatibility
After migrating base image from Alpine to Debian Trixie (PR #550), integration test scripts were using wget-style options with curl that don't work correctly on Debian. Changed curl -q -O- (wget syntax) to curl -sf (proper curl): waf_integration.sh cerberus_integration.sh rate_limit_integration.sh crowdsec_startup_test.sh install-go-1.25.5.sh Also added future phase to plan for Playwright security test helpers to prevent ACL deadlock issues during E2E testing. Refs: #550
This commit is contained in:
@@ -196,7 +196,7 @@ docker run -d --name ${CONTAINER_NAME} \
|
||||
|
||||
log_info "Waiting for Charon API to be ready..."
|
||||
for i in {1..30}; do
|
||||
if curl -s -f "http://localhost:${API_PORT}/api/v1/" >/dev/null 2>&1; then
|
||||
if curl -s -f "http://localhost:${API_PORT}/api/v1/health" >/dev/null 2>&1; then
|
||||
log_info "Charon API is ready"
|
||||
break
|
||||
fi
|
||||
@@ -211,7 +211,7 @@ echo ""
|
||||
|
||||
log_info "Waiting for httpbin backend to be ready..."
|
||||
for i in {1..20}; do
|
||||
if docker exec ${CONTAINER_NAME} sh -c "curl -q -O- http://${BACKEND_CONTAINER}/get 2>/dev/null || curl -s http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
|
||||
if docker exec ${CONTAINER_NAME} sh -c "curl -sf http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
|
||||
log_info "httpbin backend is ready"
|
||||
break
|
||||
fi
|
||||
|
||||
@@ -175,7 +175,7 @@ fi
|
||||
log_test "Check 2: CrowdSec LAPI health (127.0.0.1:8085/health)"
|
||||
|
||||
# Use docker exec to check LAPI health from inside the container
|
||||
LAPI_HEALTH=$(docker exec ${CONTAINER_NAME} curl -q -O- http://127.0.0.1:8085/health 2>/dev/null || echo "FAILED")
|
||||
LAPI_HEALTH=$(docker exec ${CONTAINER_NAME} curl -sf http://127.0.0.1:8085/health 2>/dev/null || echo "FAILED")
|
||||
|
||||
if [ "$LAPI_HEALTH" != "FAILED" ] && [ -n "$LAPI_HEALTH" ]; then
|
||||
log_info " LAPI is healthy"
|
||||
|
||||
@@ -15,7 +15,7 @@ TMPFILE="/tmp/${TARFILE}"
|
||||
# Download
|
||||
if [ ! -f "$TMPFILE" ]; then
|
||||
echo "Downloading go${GO_VERSION}..."
|
||||
curl -q -O "$TMPFILE" "https://go.dev/dl/${TARFILE}"
|
||||
curl -sSfL -o "$TMPFILE" "https://go.dev/dl/${TARFILE}"
|
||||
fi
|
||||
|
||||
# Remove existing installation
|
||||
|
||||
@@ -166,7 +166,7 @@ docker run -d --name ${CONTAINER_NAME} \
|
||||
|
||||
echo "Waiting for Charon API to be ready..."
|
||||
for i in {1..30}; do
|
||||
if curl -s -f http://localhost:8280/api/v1/ >/dev/null 2>&1; then
|
||||
if curl -s -f http://localhost:8280/api/v1/health >/dev/null 2>&1; then
|
||||
echo "✓ Charon API is ready"
|
||||
break
|
||||
fi
|
||||
@@ -187,7 +187,7 @@ docker run -d --name ${BACKEND_CONTAINER} --network containers_default kennethre
|
||||
|
||||
echo "Waiting for httpbin backend to be ready..."
|
||||
for i in {1..20}; do
|
||||
if docker exec ${CONTAINER_NAME} sh -c "curl -q -O- http://${BACKEND_CONTAINER}/get 2>/dev/null || curl -s http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
|
||||
if docker exec ${CONTAINER_NAME} sh -c "curl -sf http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
|
||||
echo "✓ httpbin backend is ready"
|
||||
break
|
||||
fi
|
||||
|
||||
@@ -187,7 +187,7 @@ docker run -d --name ${CONTAINER_NAME} \
|
||||
|
||||
log_info "Waiting for Charon API to be ready..."
|
||||
for i in {1..30}; do
|
||||
if curl -s -f "http://localhost:${API_PORT}/api/v1/" >/dev/null 2>&1; then
|
||||
if curl -s -f "http://localhost:${API_PORT}/api/v1/health" >/dev/null 2>&1; then
|
||||
log_info "Charon API is ready"
|
||||
break
|
||||
fi
|
||||
@@ -202,7 +202,7 @@ echo ""
|
||||
|
||||
log_info "Waiting for httpbin backend to be ready..."
|
||||
for i in {1..20}; do
|
||||
if docker exec ${CONTAINER_NAME} sh -c "curl -q -O- http://${BACKEND_CONTAINER}/get 2>/dev/null || curl -s http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
|
||||
if docker exec ${CONTAINER_NAME} sh -c "curl -sf http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
|
||||
log_info "httpbin backend is ready"
|
||||
break
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user