updated per code review

Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
notaryproject · Aug 31, 2023 · f0b5b46 · f0b5b46
1 parent 06b9ea4
commit f0b5b46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/notation.go b/notation.go
@@ -381,7 +381,7 @@ func Verify(ctx context.Context, verifier Verifier, repo registry.Repository, ve
 					return err
 				}
 				outcome.Error = fmt.Errorf("failed to verify signature with digest %v, %w", sigManifestDesc.Digest, outcome.Error)
-				verificationOutcomes = append(verificationOutcomes, outcome)
+				verificationFailedErr = errors.Join(verificationFailedErr, outcome.Error)
 				continue
 			}
 			// at this point, the signature is verified successfully

diff --git a/verifier/truststore/truststore.go b/verifier/truststore/truststore.go
@@ -77,7 +77,7 @@ func (trustStore *x509TrustStore) GetCertificates(ctx context.Context, storeType
 	fileInfo, err := os.Lstat(path)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return nil, ErrorTrustStore{InnerError: fs.ErrNotExist, Msg: fmt.Sprintf("the trust store %q of type %q doesn't exist", namedStore, storeType)}
+			return nil, ErrorTrustStore{InnerError: err, Msg: fmt.Sprintf("the trust store %q of type %q doesn't exist", namedStore, storeType)}
 		}
 		return nil, ErrorTrustStore{InnerError: fmt.Errorf("failed to access the trust store %q: %w", path, err)}
 	}