Skip to content

fix(transfer): trust axon upload s3 key #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shark0F0497 merged 2 commits into from
May 27, 2026
Merged

fix(transfer): trust axon upload s3 key #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6937cd
fix(transfer): trust axon upload s3 key
shark0F0497 May 26, 2026
732e49a
Merge remote-tracking branch 'origin/main' into keystone-worktree2-main
shark0F0497 May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions internal/api/handlers/transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,17 @@ func readSidecarFromS3(ctx context.Context, s3Client *s3.Client, bucket, jsonKey
return &sc
}

func uploadCompleteS3Key(data map[string]interface{}) string {
return strings.TrimSpace(stringVal(data, "s3_key"))
}

func uploadCompleteSidecarS3Key(mcapKey string) (string, bool) {
if !strings.HasSuffix(mcapKey, ".mcap") {
return "", false
}
return strings.TrimSuffix(mcapKey, ".mcap") + ".json", true
}

// onUploadComplete handles "upload_complete" and runs the Verified ACK flow:
// 1. Verify S3 files exist
// 2. Update episodes table
Expand Down Expand Up @@ -352,9 +363,19 @@ func (h *TransferHandler) onUploadComplete(ctx context.Context, dc *services.Tra
}

// Step 1: Verify S3 files exist (parallel execution)
today := time.Now().Format("2006-01-02")
mcapKey := fmt.Sprintf("%s/%s/%s/%s.mcap", h.factoryID, dc.DeviceID, today, taskID)
jsonKey := fmt.Sprintf("%s/%s/%s/%s.json", h.factoryID, dc.DeviceID, today, taskID)
mcapKey := uploadCompleteS3Key(data)
if mcapKey == "" {
// #nosec G706 -- Set aside for now
logger.Printf("[TRANSFER] Device %s: upload_complete for task=%s missing s3_key, skipping ACK", dc.DeviceID, taskID)
return
}

jsonKey, ok := uploadCompleteSidecarS3Key(mcapKey)
if !ok {
// #nosec G706 -- Set aside for now
logger.Printf("[TRANSFER] Device %s: upload_complete for task=%s has invalid MCAP s3_key=%q, cannot derive sidecar key, skipping ACK", dc.DeviceID, taskID, mcapKey)
return
}

// Persist full path including bucket for clarity and easier downstream consumption.
mcapPath := fmt.Sprintf("%s/%s", h.bucket, mcapKey)
Expand Down
Loading