Merge pull request #619 from laverya/ineffassign-fixes

laverya · web-flow · commit acbfd015473a · 2018-10-03T12:31:22.000-07:00
fix places where we drop err
diff --git a/pkg/ship/watch.go b/pkg/ship/watch.go
@@ -49,6 +49,9 @@ func (s *Ship) Watch(ctx context.Context) error {
 		}
 
 		contentSHA, err := s.Resolver.ReadContentSHAForWatch(ctx, upstream)
+		if err != nil {
+			return errors.Wrap(err, "read content SHA")
+		}
 
 		if contentSHA != existingState.Versioned().V1.ContentSHA {
 			debug.Log(
diff --git a/pkg/specs/interface.go b/pkg/specs/interface.go
@@ -115,6 +115,10 @@ func (r *Resolver) ReadContentSHAForWatch(ctx context.Context, upstream string)
 		selector := (&replicatedapp.Selector{}).UnmarshalFrom(parsed)
 
 		release, err := r.AppResolver.FetchRelease(ctx, selector)
+		if err != nil {
+			return "", errors.Wrap(err, "fetch release")
+		}
+
 		return fmt.Sprintf("%x", sha256.Sum256([]byte(release.Spec))), nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ func (s *Ship) Watch(ctx context.Context) error {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`contentSHA, err := s.Resolver.ReadContentSHAForWatch(ctx, upstream)`
	`52`	`+ if err != nil {`
	`53`	`+ return errors.Wrap(err, "read content SHA")`
	`54`	`+ }`
`52`	`55`
`53`	`56`	`if contentSHA != existingState.Versioned().V1.ContentSHA {`
`54`	`57`	`debug.Log(`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@ func (r *Resolver) ReadContentSHAForWatch(ctx context.Context, upstream string)`
`115`	`115`	`selector := (&replicatedapp.Selector{}).UnmarshalFrom(parsed)`
`116`	`116`
`117`	`117`	`release, err := r.AppResolver.FetchRelease(ctx, selector)`
	`118`	`+ if err != nil {`
	`119`	`+ return "", errors.Wrap(err, "fetch release")`
	`120`	`+ }`
	`121`	`+`
`118`	`122`	`return fmt.Sprintf("%x", sha256.Sum256([]byte(release.Spec))), nil`
`119`	`123`	`}`
`120`	`124`