Skip to content

Commit

Permalink
Merge pull request #39 from thin-edge/fix-log-upload-mtls
Browse files Browse the repository at this point in the history
fix(log_upload): allow url redirects to support cert based auth
  • Loading branch information
reubenmiller authored Oct 28, 2024
2 parents eb05397 + 00eaeea commit 3f7638e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions files/tedge/container-logs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ echo "Uploading log file to $UPLOAD_URL" >&2
if [ -f "$(tedge config get http.client.auth.key_file)" ] && [ -f "$(tedge config get http.client.auth.cert_file)" ]; then
# Upload using mtl
echo "Uploading log file using mtls"
curl -4 -sf \
curl -4 -sfL \
-XPUT \
--data-binary "@$TMP_FILE" \
--capath "$(tedge config get http.ca_path)" \
Expand All @@ -93,5 +93,5 @@ if [ -f "$(tedge config get http.client.auth.key_file)" ] && [ -f "$(tedge confi
"$UPLOAD_URL"
else
# Upload using default
curl -4 -sf -XPUT --data-binary "@$TMP_FILE" "$UPLOAD_URL"
curl -4 -sfL -XPUT --data-binary "@$TMP_FILE" "$UPLOAD_URL"
fi

1 comment on commit 3f7638e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
12 0 1 12 100 1m25.598659s

Passed Tests

Name ⏱️ Duration Suite
Grace period to allow container to startup 5.002 s Operations
Get Logfile Request 2.503 s Operations
Get Configuration File 4.988 s Operations
Execute Shell Command 2.494 s Operations
Install application using docker compose 23.102 s Operations
Get Container Logs 2.498 s Operations
Trigger self update via local command 12.183 s Self-Update
Self update should only update if there is a new image 4.658 s Self-Update
Self update using software update operation 24.987 s Self-Update
Cloud Connection is Online 0.175 s Telemetry
Service status 0.345 s Telemetry
Sends measurements 2.663 s Telemetry

Please sign in to comment.