chore: reword errors

Author: nginx-nickc

pkg/files/file_stream.go

@@ -119,11 +119,11 @@ func recvContents(
 		}
 		totalSize -= len(data)
 		if 0 > totalSize {
-			return fmt.Errorf("unexpected content: %d more data than expected", 0-totalSize)
+			return fmt.Errorf("unexpected content: %d bytes more data than expected", 0-totalSize)
 		}
 	}
 	if totalSize > 0 {
-		return fmt.Errorf("unexpected content: unexpected end of content, %d left", totalSize)
+		return fmt.Errorf("unexpected content: unexpected end of content, expected additional %d bytes", totalSize)
 	}
 
 	return nil
@@ -132,14 +132,16 @@ func recvContents(
 func validateRecvChunk(chunk *v1.FileDataChunk, chunkSize, lastChunkIndex, i int) error {
 	content := chunk.GetContent()
 	if content == nil {
-		return fmt.Errorf("no content")
+		return fmt.Errorf("no content in chunk id %d", i)
 	}
 	if content.GetChunkId() != uint32(i) {
-		return fmt.Errorf("unexpected chunk id %d, expected %d", content.GetChunkId(), i)
+		return fmt.Errorf("content chunk id of %d does not match expected id of %d",
+			content.GetChunkId(), i)
 	}
 	data := content.GetData()
 	if len(data) != chunkSize && i != lastChunkIndex {
-		return fmt.Errorf("content chunk size %d, expected %d", len(data), chunkSize)
+		return fmt.Errorf("content chunk size of %d does not match expected size of %d",
+			len(data), chunkSize)
 	}
 
 	return nil

pkg/files/file_stream_test.go

@@ -277,7 +277,7 @@ func TestRecvChunkedFile(t *testing.T) {
 				},
 			},
 			// last chunk can be undersized
-			expectedErrString: "1500 left",
+			expectedErrString: "expected additional 1500 bytes",
 		},
 		{
 			name: "Test 4: data unmatched - chunks size",
@@ -314,7 +314,7 @@ func TestRecvChunkedFile(t *testing.T) {
 					},
 				},
 			},
-			expectedErrString: "content chunk size 0, expected 1500",
+			expectedErrString: "content chunk size of 0 does not match expected size of 1500",
 		},
 		{
 			name: "Test 5: data unmatched - extra",
@@ -353,7 +353,7 @@ func TestRecvChunkedFile(t *testing.T) {
 					},
 				},
 			},
-			expectedErrString: "1500 more data than expected",
+			expectedErrString: "unexpected content: 1500 bytes more data than expected",
 		},
 		{
 			name: "Test 6: data unmatched - chunk id",
@@ -382,7 +382,7 @@ func TestRecvChunkedFile(t *testing.T) {
 					},
 				},
 			},
-			expectedErrString: "unexpected chunk id 5, expected 0",
+			expectedErrString: "content chunk id of 5 does not match expected id of 0",
 		},
 		{
 			name: "Test 7: content recv error",