Make delivery asset outcomes disjoint

internal/gitea/upload.go

@@ -33,13 +33,21 @@ type AssetIdentity struct {
 	SHA256   string
 }
 
+// UploadResult reports the current asset observations from one upload attempt.
+// Each identity appears in at most one category; early failures can leave some
+// declared assets unreported.
 type UploadResult struct {
-	State       DeliveryState
-	Matching    []AssetIdentity
-	Uploaded    []AssetIdentity
-	Pending     []AssetIdentity
+	State DeliveryState
+	// Matching contains existing attachments with the declared content.
+	Matching []AssetIdentity
+	// Uploaded contains assets whose upload was confirmed during this invocation.
+	Uploaded []AssetIdentity
+	// Pending contains assets known to be missing.
+	Pending []AssetIdentity
+	// Conflicting contains assets with detected content conflicts.
 	Conflicting []AssetIdentity
-	Uncertain   []AssetIdentity
+	// Uncertain contains assets whose remote state could not be resolved.
+	Uncertain []AssetIdentity
 }
 
 // VerifyLocalAssets checks that every expected file still matches its declared
@@ -146,6 +154,7 @@ func (c Client) UploadMissing(ctx context.Context, destination Destination, rele
 		inspection, inspectErr := c.InspectAssets(ctx, destination, releaseID, []ExpectedAsset{item})
 		if inspectErr != nil || len(inspection.Assets) != 1 {
 			result.State = DeliveryUnknown
+			result.Pending = removeIdentity(result.Pending, item.Filename)
 			result.Uncertain = append(result.Uncertain, identity(item))
 			return result, failure(FailureUnknown, "resolve asset upload", status, errors.Join(uploadErr, inspectErr))
 		}
@@ -156,15 +165,18 @@ func (c Client) UploadMissing(ctx context.Context, destination Destination, rele
 			result.Pending = removeIdentity(result.Pending, item.Filename)
 		case AssetConflicting:
 			result.State = DeliveryConflict
+			result.Pending = removeIdentity(result.Pending, item.Filename)
 			result.Conflicting = append(result.Conflicting, identity(item))
 			return result, failure(FailureConflict, "resolve asset upload", status, uploadErr)
 		case AssetMissing:
 			if status == http.StatusConflict {
 				result.State = DeliveryConflict
+				result.Pending = removeIdentity(result.Pending, item.Filename)
 				result.Conflicting = append(result.Conflicting, identity(item))
 				return result, failure(FailureConflict, "resolve asset upload", status, uploadErr)
 			}
 			result.State = DeliveryUnknown
+			result.Pending = removeIdentity(result.Pending, item.Filename)
 			result.Uncertain = append(result.Uncertain, identity(item))
 			return result, failure(FailureUnknown, "resolve asset upload", status, uploadErr)
 		default: