Stage uploads before accepting HTTP runs

internal/app/upload_http_test.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"gitea.maximumdirect.net/eric/distributor/internal/config"
+	"gitea.maximumdirect.net/eric/distributor/internal/ingest"
 )
 
 type fakeUploadCoordinator struct {
@@ -41,7 +42,7 @@ func (fake fakeUploadCoordinator) Status(runID UploadRunID) (UploadRunRecord, bo
 func TestResolveUploadTokensFailsForMissingAndDuplicateTokens(t *testing.T) {
 	cfg := uploadHTTPTestConfig()
 
-	_, _, err := resolveUploadTokens(cfg, config.NewEnvironment(nil, func(string) (string, bool) {
+	_, err := resolveUploadTokens(cfg, config.NewEnvironment(nil, func(string) (string, bool) {
 		return "", false
 	}))
 	if err == nil || !strings.Contains(err.Error(), "UPLOAD_TOKEN") {
@@ -58,7 +59,7 @@ func TestResolveUploadTokensFailsForMissingAndDuplicateTokens(t *testing.T) {
 	})
 	config.ApplyDefaults(&cfg)
 	secret := "super-secret-token"
-	_, _, err = resolveUploadTokens(cfg, uploadHTTPTestEnvironment(map[string]string{
+	_, err = resolveUploadTokens(cfg, uploadHTTPTestEnvironment(map[string]string{
 		"UPLOAD_TOKEN":       secret,
 		"OTHER_UPLOAD_TOKEN": secret,
 	}))
@@ -110,7 +111,6 @@ func TestUploadHTTPHandlerAuthenticatesAndAcceptsUpload(t *testing.T) {
 			},
 		},
 		tokens: map[string]string{"valid-token": "reports"},
-		limits: map[string]int64{"reports": 1024},
 	}
 	recorder := httptest.NewRecorder()
 	request := httptest.NewRequest(http.MethodPost, "/upload", strings.NewReader("archive"))
@@ -141,7 +141,6 @@ func TestUploadHTTPHandlerRejectsUnauthorizedRequests(t *testing.T) {
 	handler := uploadHTTPHandler{
 		coordinator: fakeUploadCoordinator{canAccept: true},
 		tokens:      map[string]string{"valid-token": "reports"},
-		limits:      map[string]int64{"reports": 1024},
 	}
 
 	for _, authHeader := range []string{"", "Bearer wrong-token"} {
@@ -178,14 +177,6 @@ func TestUploadHTTPHandlerRejectsUnsupportedOversizedFullQueueAndPipelineID(t *t
 			body:        strings.NewReader("archive"),
 			wantStatus:  http.StatusUnsupportedMediaType,
 		},
-		{
-			name:        "oversized",
-			canAccept:   true,
-			url:         "/upload",
-			contentType: "application/x-tar",
-			body:        strings.NewReader("too-large"),
-			wantStatus:  http.StatusRequestEntityTooLarge,
-		},
 		{
 			name:        "full queue",
 			canAccept:   false,
@@ -214,7 +205,6 @@ func TestUploadHTTPHandlerRejectsUnsupportedOversizedFullQueueAndPipelineID(t *t
 					},
 				},
 				tokens: map[string]string{"valid-token": "reports"},
-				limits: map[string]int64{"reports": 4},
 			}
 			recorder := httptest.NewRecorder()
 			request := httptest.NewRequest(http.MethodPost, tt.url, tt.body)
@@ -233,6 +223,41 @@ func TestUploadHTTPHandlerRejectsUnsupportedOversizedFullQueueAndPipelineID(t *t
 	}
 }
 
+func TestUploadHTTPHandlerMapsSubmitErrors(t *testing.T) {
+	tests := []struct {
+		name       string
+		err        error
+		wantStatus int
+	}{
+		{name: "oversized", err: ingest.ErrUploadTooLarge, wantStatus: http.StatusRequestEntityTooLarge},
+		{name: "unsupported", err: ingest.ErrUnsupportedContentType, wantStatus: http.StatusUnsupportedMediaType},
+		{name: "malformed", err: errors.New("malformed archive"), wantStatus: http.StatusBadRequest},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := uploadHTTPHandler{
+				coordinator: fakeUploadCoordinator{
+					canAccept: true,
+					submit: func(context.Context, UploadRequest) (UploadRunRecord, error) {
+						return UploadRunRecord{}, tt.err
+					},
+				},
+				tokens: map[string]string{"valid-token": "reports"},
+			}
+			recorder := httptest.NewRecorder()
+			request := httptest.NewRequest(http.MethodPost, "/upload", strings.NewReader("archive"))
+			request.Header.Set("Authorization", "Bearer valid-token")
+			request.Header.Set("Content-Type", "application/x-tar")
+
+			handler.ServeHTTP(recorder, request)
+
+			if recorder.Code != tt.wantStatus {
+				t.Fatalf("status = %d, want %d; body = %q", recorder.Code, tt.wantStatus, recorder.Body.String())
+			}
+		})
+	}
+}
+
 func TestUploadHTTPHandlerRunStatusAndHealth(t *testing.T) {
 	finishedAt := time.Date(2026, 6, 3, 12, 0, 0, 0, time.UTC)
 	handler := uploadHTTPHandler{
@@ -251,7 +276,6 @@ func TestUploadHTTPHandlerRunStatusAndHealth(t *testing.T) {
 			},
 		},
 		tokens: map[string]string{"valid-token": "reports"},
-		limits: map[string]int64{"reports": 1024},
 	}
 
 	recorder := httptest.NewRecorder()