Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update logs for migrate CertStore to KMP #2039

Merged
merged 2 commits into from
Jan 21, 2025
Merged

chore: update logs for migrate CertStore to KMP #2039

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83bab2f
chore: update logs for migrate CertStore to KMP
binbin-li Jan 20, 2025
c9fcd51
Merge branch 'dev' into fix-kmp-warning
susanshi Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/verifier/notation/truststore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ func (s *trustStore) getCertificatesInternal(ctx context.Context, storeType trus
logger.GetLogger(ctx, logOpt).Debugf("truststore getting certStore %v", certStore)
certMap, kmpErr := keymanagementprovider.GetCertificatesFromMap(ctx, certStore)
if kmpErr != nil {
logger.GetLogger(ctx, logOpt).Warnf("unable to fetch certificates for Key Management Provider %+v: %v", certStore, kmpErr)
logger.GetLogger(ctx, logOpt).Infof("unable to fetch certificates for Key Management Provider %+v: %v", certStore, kmpErr)
}
result := keymanagementprovider.FlattenKMPMap(certMap)
var certStoreErr error
// notation verifier does not consider specific named/versioned certificates within a key management provider resource
if len(result) == 0 {
logger.GetLogger(ctx, logOpt).Warnf("no certificate fetched for Key Management Provider %+v", certStore)
logger.GetLogger(ctx, logOpt).Infof("no certificate fetched for Key Management Provider %+v", certStore)
susanshi marked this conversation as resolved.
Show resolved Hide resolved
// check certificate store if key management provider does not have certificates.
// NOTE: certificate store and key management provider should not be configured together.
// User will be warned by the controller/CLI
Expand All @@ -87,6 +87,8 @@ func (s *trustStore) getCertificatesInternal(ctx context.Context, storeType trus
}
if len(result) == 0 {
logger.GetLogger(ctx, logOpt).Warnf("no certificate fetched for Certificate Store %+v", certStore)
} else {
logger.GetLogger(ctx, logOpt).Info("Certificate Store has been deprecated since v1.2.0, please migrate to Key Management Provider following: https://ratify.dev/docs/reference/custom%20resources/key-management-providers#migrating-from-certificatestore-to-kmp")
}
}
if err := parseErrFromKmpAndCertStore(kmpErr, certStoreErr); err != nil {
Expand Down
Loading