fix nit with multierror (#1124)

* fix nit with errorornil * consistency
google · Oct 29, 2020 · 7fe5a84 · 7fe5a84
1 parent d22c576
commit 7fe5a84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/internal/keyrotation/rotate.go b/internal/keyrotation/rotate.go
@@ -86,7 +86,7 @@ func (s *Server) doRotate(ctx context.Context) error {
 		previousCreated = allowed[0].CreatedAt
 	}
 
-	var result error
+	var result *multierror.Error
 	deleted := 0
 	for _, key := range allowed {
 		if did, err := s.maybeDeleteKey(ctx, key, effectiveID, previousCreated); err != nil {
@@ -100,7 +100,7 @@ func (s *Server) doRotate(ctx context.Context) error {
 		logger.Infof("Deleted %d old revision keys.", deleted)
 		metricsMiddleware.RecordRevisionKeyDeletion(ctx, deleted)
 	}
-	return result
+	return result.ErrorOrNil()
 }
 
 func (s *Server) maybeDeleteKey(

diff --git a/tools/export-analyzer/main.go b/tools/export-analyzer/main.go
@@ -113,11 +113,7 @@ func checkExportFile(export *exportpb.TemporaryExposureKeyExport) error {
 	if err := checkKeys("revisedKeys", export.RevisedKeys, floor, ceiling); err != nil {
 		errors = multierror.Append(errors, err)
 	}
-
-	if errors != nil && len(errors.Errors) != 0 {
-		return errors
-	}
-	return nil
+	return errors.ErrorOrNil()
 }
 
 func checkKeys(kType string, keys []*exportpb.TemporaryExposureKey, floor, ceiling int32) error {