Remove before checking in

annotator/annotator.go

@@ -59,7 +59,7 @@ func Run(ctx context.Context, config *Config, inventory *inventory.Inventory) ([
 
 	for _, a := range config.Annotators {
 		err := a.Annotate(ctx, input, inventory)
-		statuses = append(statuses, plugin.StatusFromErr(a, false, err))
+		statuses = append(statuses, plugin.StatusFromErr(a, false, err, nil))
 	}
 	return statuses, nil
 }

binary/proto/plugin.go

@@ -61,7 +61,18 @@ func scanStatusToProto(s *plugin.ScanStatus) *spb.ScanStatus {
 		return nil
 	}
 	statusEnum := structToProtoScanStatus[s.Status]
-	return &spb.ScanStatus{Status: statusEnum, FailureReason: s.FailureReason}
+	return &spb.ScanStatus{Status: statusEnum, FailureReason: s.FailureReason, FileErrors: fileErrorsToProto(s.FileErrors)}
+}
+
+func fileErrorsToProto(s []*plugin.FileError) []*spb.FileError {
+	if s == nil {
+		return nil
+	}
+	var res []*spb.FileError
+	for _, e := range s {
+		res = append(res, &spb.FileError{FilePath: e.FilePath, ErrorMessage: e.ErrorMessage})
+	}
+	return res
 }
 
 // --- Proto to Struct
@@ -84,5 +95,16 @@ func scanStatusToStruct(s *spb.ScanStatus) *plugin.ScanStatus {
 		return nil
 	}
 	statusEnum := protoToStructScanStatus[s.GetStatus()]
-	return &plugin.ScanStatus{Status: statusEnum, FailureReason: s.GetFailureReason()}
+	return &plugin.ScanStatus{Status: statusEnum, FailureReason: s.GetFailureReason(), FileErrors: fileErrorsToStruct(s.GetFileErrors())}
+}
+
+func fileErrorsToStruct(s []*spb.FileError) []*plugin.FileError {
+	if s == nil {
+		return nil
+	}
+	var res []*plugin.FileError
+	for _, e := range s {
+		res = append(res, &plugin.FileError{FilePath: e.GetFilePath(), ErrorMessage: e.GetErrorMessage()})
+	}
+	return res
 }

binary/proto/plugin_test.go

@@ -52,6 +52,31 @@ func TestPluginStatusToProto(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc: "converts file errors",
+			s: &plugin.Status{
+				Name:    "test-plugin-with-file-errors",
+				Version: 1,
+				Status: &plugin.ScanStatus{
+					Status: plugin.ScanStatusPartiallySucceeded,
+					FileErrors: []*plugin.FileError{
+						{FilePath: "file1", ErrorMessage: "error1"},
+						{FilePath: "file2", ErrorMessage: "error2"},
+					},
+				},
+			},
+			want: &spb.PluginStatus{
+				Name:    "test-plugin-with-file-errors",
+				Version: 1,
+				Status: &spb.ScanStatus{
+					Status: spb.ScanStatus_PARTIALLY_SUCCEEDED,
+					FileErrors: []*spb.FileError{
+						{FilePath: "file1", ErrorMessage: "error1"},
+						{FilePath: "file2", ErrorMessage: "error2"},
+					},
+				},
+			},
+		},
 		{
 			desc: "nil status",
 			s: &plugin.Status{

binary/proto/scan_result.proto

@@ -53,6 +53,8 @@ message Inventory {
 message ScanStatus {
   ScanStatusEnum status = 1;
   string failure_reason = 2;
+  repeated FileError file_errors = 4;
+
   enum ScanStatusEnum {
     UNSPECIFIED = 0;
     SUCCEEDED = 1;
@@ -67,6 +69,11 @@ message PluginStatus {
   ScanStatus status = 3;
 }
 
+message FileError {
+  string file_path = 1;
+  string error_message = 2;
+}
+
 // A software package or library found by an extractor.
 // PURL or CPE needs to be set, maybe both.
 message Package {