Browse code

builder-next: explicitely ignore unhandled errors (errcheck)

```
builder/builder-next/adapters/containerimage/pull.go:278:23: Error return value of `resolveProgressDone` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:286:24: Error return value of `resolveProgressDone` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:303:24: Error return value of `resolveProgressDone` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:309:24: Error return value of `resolveProgressDone` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:315:22: Error return value of `resolveProgressDone` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:512:14: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:675:13: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:700:14: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:786:10: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/adapters/containerimage/pull.go:791:11: Error return value of `pw.Write` is not checked (errcheck)

builder/builder-next/exporter/export.go:133:13: Error return value of `layersDone` is not checked (errcheck)
builder/builder-next/exporter/export.go:163:12: Error return value of `configDone` is not checked (errcheck)
builder/builder-next/exporter/export.go:172:11: Error return value of `tagDone` is not checked (errcheck)
builder/builder-next/exporter/writer.go:207:10: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/exporter/writer.go:212:11: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/worker/worker.go:397:6: Error return value of `done` is not checked (errcheck)
builder/builder-next/worker/worker.go:446:10: Error return value of `pw.Write` is not checked (errcheck)
builder/builder-next/worker/worker.go:451:11: Error return value of `pw.Write` is not checked (errcheck)
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/08/29 00:42:47
Showing 4 changed files
... ...
@@ -275,7 +275,7 @@ func (p *puller) resolve(ctx context.Context) error {
275 275
 		ref, err := distreference.ParseNormalizedNamed(p.src.Reference.String())
276 276
 		if err != nil {
277 277
 			p.resolveErr = err
278
-			resolveProgressDone(err)
278
+			_ = resolveProgressDone(err)
279 279
 			return
280 280
 		}
281 281
 
... ...
@@ -283,7 +283,7 @@ func (p *puller) resolve(ctx context.Context) error {
283 283
 			origRef, desc, err := p.resolver.Resolve(ctx, ref.String())
284 284
 			if err != nil {
285 285
 				p.resolveErr = err
286
-				resolveProgressDone(err)
286
+				_ = resolveProgressDone(err)
287 287
 				return
288 288
 			}
289 289
 
... ...
@@ -300,19 +300,19 @@ func (p *puller) resolve(ctx context.Context) error {
300 300
 			ref, err := distreference.WithDigest(ref, p.desc.Digest)
301 301
 			if err != nil {
302 302
 				p.resolveErr = err
303
-				resolveProgressDone(err)
303
+				_ = resolveProgressDone(err)
304 304
 				return
305 305
 			}
306 306
 			_, dt, err := p.is.ResolveImageConfig(ctx, ref.String(), gw.ResolveImageConfigOpt{Platform: &p.platform, ResolveMode: resolveModeToString(p.src.ResolveMode)}, p.sm)
307 307
 			if err != nil {
308 308
 				p.resolveErr = err
309
-				resolveProgressDone(err)
309
+				_ = resolveProgressDone(err)
310 310
 				return
311 311
 			}
312 312
 
313 313
 			p.config = dt
314 314
 		}
315
-		resolveProgressDone(nil)
315
+		_ = resolveProgressDone(nil)
316 316
 	})
317 317
 	return p.resolveErr
318 318
 }
... ...
@@ -509,7 +509,7 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
509 509
 						tm := time.Now()
510 510
 						end = &tm
511 511
 					}
512
-					pw.Write("extracting "+p.ID, progress.Status{
512
+					_ = pw.Write("extracting "+p.ID, progress.Status{
513 513
 						Action:    "extract",
514 514
 						Started:   &st.st,
515 515
 						Completed: end,
... ...
@@ -672,7 +672,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr
672 672
 			refKey := remotes.MakeRefKey(ctx, j.Descriptor)
673 673
 			if a, ok := actives[refKey]; ok {
674 674
 				started := j.started
675
-				pw.Write(j.Digest.String(), progress.Status{
675
+				_ = pw.Write(j.Digest.String(), progress.Status{
676 676
 					Action:  a.Status,
677 677
 					Total:   int(a.Total),
678 678
 					Current: int(a.Offset),
... ...
@@ -685,7 +685,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr
685 685
 				info, err := cs.Info(context.TODO(), j.Digest)
686 686
 				if err != nil {
687 687
 					if containerderrors.IsNotFound(err) {
688
-						// pw.Write(j.Digest.String(), progress.Status{
688
+						// _ = pw.Write(j.Digest.String(), progress.Status{
689 689
 						// 	Action: "waiting",
690 690
 						// })
691 691
 						continue
... ...
@@ -697,7 +697,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr
697 697
 				if done || j.done {
698 698
 					started := j.started
699 699
 					createdAt := info.CreatedAt
700
-					pw.Write(j.Digest.String(), progress.Status{
700
+					_ = pw.Write(j.Digest.String(), progress.Status{
701 701
 						Action:    "done",
702 702
 						Current:   int(info.Size),
703 703
 						Total:     int(info.Size),
... ...
@@ -783,13 +783,13 @@ func oneOffProgress(ctx context.Context, id string) func(err error) error {
783 783
 	st := progress.Status{
784 784
 		Started: &now,
785 785
 	}
786
-	pw.Write(id, st)
786
+	_ = pw.Write(id, st)
787 787
 	return func(err error) error {
788 788
 		// TODO: set error on status
789 789
 		now := time.Now()
790 790
 		st.Completed = &now
791
-		pw.Write(id, st)
792
-		pw.Close()
791
+		_ = pw.Write(id, st)
792
+		_ = pw.Close()
793 793
 		return err
794 794
 	}
795 795
 }
... ...
@@ -130,7 +130,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, inp exporter.Source)
130 130
 			diffs[i] = digest.Digest(diffIDs[i])
131 131
 		}
132 132
 
133
-		layersDone(nil)
133
+		_ = layersDone(nil)
134 134
 	}
135 135
 
136 136
 	if len(config) == 0 {
... ...
@@ -160,7 +160,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, inp exporter.Source)
160 160
 	if err != nil {
161 161
 		return nil, configDone(err)
162 162
 	}
163
-	configDone(nil)
163
+	_ = configDone(nil)
164 164
 
165 165
 	if e.opt.ReferenceStore != nil {
166 166
 		for _, targetName := range e.targetNames {
... ...
@@ -169,7 +169,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, inp exporter.Source)
169 169
 			if err := e.opt.ReferenceStore.AddTag(targetName, digest.Digest(id), true); err != nil {
170 170
 				return nil, tagDone(err)
171 171
 			}
172
-			tagDone(nil)
172
+			_ = tagDone(nil)
173 173
 		}
174 174
 	}
175 175
 
... ...
@@ -204,13 +204,13 @@ func oneOffProgress(ctx context.Context, id string) func(err error) error {
204 204
 	st := progress.Status{
205 205
 		Started: &now,
206 206
 	}
207
-	pw.Write(id, st)
207
+	_ = pw.Write(id, st)
208 208
 	return func(err error) error {
209 209
 		// TODO: set error on status
210 210
 		now := time.Now()
211 211
 		st.Completed = &now
212
-		pw.Write(id, st)
213
-		pw.Close()
212
+		_ = pw.Write(id, st)
213
+		_ = pw.Close()
214 214
 		return err
215 215
 	}
216 216
 }
... ...
@@ -394,7 +394,7 @@ func (ld *layerDescriptor) Download(ctx context.Context, progressOutput pkgprogr
394 394
 	if err := contentutil.Copy(ctx, ld.w.ContentStore, ld.provider, ld.desc); err != nil {
395 395
 		return nil, 0, done(err)
396 396
 	}
397
-	done(nil)
397
+	_ = done(nil)
398 398
 
399 399
 	ra, err := ld.w.ContentStore.ReaderAt(ctx, ld.desc)
400 400
 	if err != nil {
... ...
@@ -443,13 +443,13 @@ func oneOffProgress(ctx context.Context, id string) func(err error) error {
443 443
 	st := progress.Status{
444 444
 		Started: &now,
445 445
 	}
446
-	pw.Write(id, st)
446
+	_ = pw.Write(id, st)
447 447
 	return func(err error) error {
448 448
 		// TODO: set error on status
449 449
 		now := time.Now()
450 450
 		st.Completed = &now
451
-		pw.Write(id, st)
452
-		pw.Close()
451
+		_ = pw.Write(id, st)
452
+		_ = pw.Close()
453 453
 		return err
454 454
 	}
455 455
 }