Update common implementations

pkg/sources/legacy_reporters.go

@@ -12,13 +12,12 @@ type ChanReporter struct {
 	Ch chan<- *Chunk
 }
 
-func (c ChanReporter) ChunkOk(ctx context.Context, chunk Chunk) error {
-	return common.CancellableWrite(ctx, c.Ch, &chunk)
+func (c ChanReporter) ChunkOk(ctx context.Context, chunk Chunk) {
+	_ = common.CancellableWrite(ctx, c.Ch, &chunk)
 }
 
-func (ChanReporter) ChunkErr(ctx context.Context, err error) error {
+func (ChanReporter) ChunkErr(ctx context.Context, err error) {
 	ctx.Logger().Error(err, "error chunking")
-	return ctx.Err()
 }
 
 var _ UnitReporter = (*VisitorReporter)(nil)
@@ -27,18 +26,18 @@ var _ UnitReporter = (*VisitorReporter)(nil)
 // finding units and reporting errors. VisitErr is optional; if unset it will
 // log the error.
 type VisitorReporter struct {
-	VisitUnit func(context.Context, SourceUnit) error
-	VisitErr  func(context.Context, error) error
+	VisitUnit func(context.Context, SourceUnit)
+	VisitErr  func(context.Context, error)
 }
 
-func (v VisitorReporter) UnitOk(ctx context.Context, unit SourceUnit) error {
-	return v.VisitUnit(ctx, unit)
+func (v VisitorReporter) UnitOk(ctx context.Context, unit SourceUnit) {
+	v.VisitUnit(ctx, unit)
 }
 
-func (v VisitorReporter) UnitErr(ctx context.Context, err error) error {
+func (v VisitorReporter) UnitErr(ctx context.Context, err error) {
 	if v.VisitErr == nil {
 		ctx.Logger().Error(err, "error enumerating")
-		return ctx.Err()
+		return
 	}
-	return v.VisitErr(ctx, err)
+	v.VisitErr(ctx, err)
 }

pkg/sources/source_manager.go

@@ -649,16 +649,15 @@ type mgrUnitReporter struct {
 
 // UnitOk implements the UnitReporter interface by recording the unit in the
 // report and sending it on the SourceUnit channel.
-func (s *mgrUnitReporter) UnitOk(ctx context.Context, unit SourceUnit) error {
+func (s *mgrUnitReporter) UnitOk(ctx context.Context, unit SourceUnit) {
 	s.report.ReportUnit(unit)
-	return common.CancellableWrite(ctx, s.unitCh, unit)
+	_ = common.CancellableWrite(ctx, s.unitCh, unit)
 }
 
 // UnitErr implements the UnitReporter interface by recording the error in the
 // report.
-func (s *mgrUnitReporter) UnitErr(ctx context.Context, err error) error {
+func (s *mgrUnitReporter) UnitErr(ctx context.Context, err error) {
 	s.report.ReportError(err)
-	return nil
 }
 
 // mgrChunkReporter implements the ChunkReporter interface.
@@ -672,14 +671,13 @@ type mgrChunkReporter struct {
 
 // ChunkOk implements the ChunkReporter interface by recording the chunk and
 // its associated unit in the report and sending it on the Chunk channel.
-func (s *mgrChunkReporter) ChunkOk(ctx context.Context, chunk Chunk) error {
+func (s *mgrChunkReporter) ChunkOk(ctx context.Context, chunk Chunk) {
 	s.report.ReportChunk(s.unit, &chunk)
-	return common.CancellableWrite(ctx, s.chunkCh, &chunk)
+	_ = common.CancellableWrite(ctx, s.chunkCh, &chunk)
 }
 
 // ChunkErr implements the ChunkReporter interface by recording the error and
 // its associated unit in the report.
-func (s *mgrChunkReporter) ChunkErr(ctx context.Context, err error) error {
+func (s *mgrChunkReporter) ChunkErr(ctx context.Context, err error) {
 	s.report.ReportError(ChunkError{s.unit, err})
-	return nil
 }

pkg/sources/sources.go

@@ -110,20 +110,18 @@ type baseUnitReporter struct {
 	progress *JobProgress
 }
 
-func (b baseUnitReporter) UnitOk(ctx context.Context, unit SourceUnit) error {
+func (b baseUnitReporter) UnitOk(ctx context.Context, unit SourceUnit) {
 	b.progress.ReportUnit(unit)
 	if b.child != nil {
-		return b.child.UnitOk(ctx, unit)
+		b.child.UnitOk(ctx, unit)
 	}
-	return nil
 }
 
-func (b baseUnitReporter) UnitErr(ctx context.Context, err error) error {
+func (b baseUnitReporter) UnitErr(ctx context.Context, err error) {
 	b.progress.ReportError(err)
 	if b.child != nil {
-		return b.child.UnitErr(ctx, err)
+		b.child.UnitErr(ctx, err)
 	}
-	return nil
 }
 
 // UnitReporter defines the interface a source will use to report whether a