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

fix: showing verifier config parse detail in err log #1791

Merged
merged 6 commits into from
Sep 11, 2024
+5 −2
Merged

fix: showing verifier config parse detail in err log #1791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87223b6
fix: add log to verifier parse
junczhu Sep 10, 2024
ce19656
fix: improve error log
junczhu Sep 10, 2024
7d3eafe
chore: merge dev
junczhu Sep 10, 2024
4cb8275
chore: update err msg
junczhu Sep 11, 2024
613480c
Merge branch 'dev' into truststore-config-update
binbin-li Sep 11, 2024
501011d
Merge branch 'dev' into truststore-config-update
junczhu Sep 11, 2024
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
1 change: 1 addition & 0 deletions pkg/verifier/notation/notation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ func normalizeVerificationCertsStores(conf *NotationPluginVerifierConfig) error
}
}
if isCertStoresByType && isLegacyCertStore {
logger.GetLogger(context.Background(), logOpt).Error("Get VerificationCertStores in mixed format")
return re.ErrorCodeConfigInvalid.WithDetail("The verificationCertStores is misconfigured with both legacy and new formats").WithRemediation("Please provide only one format for the VerificationCertStores. Refer to the Notation Verifier configuration guide: https://ratify.dev/docs/plugins/verifier/notation#configuration")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
logger.GetLogger(context.Background(), logOpt).Error("Get VerificationCertStores in mixed format")
return re.ErrorCodeConfigInvalid.WithDetail("The verificationCertStores is misconfigured with both legacy and new formats").WithRemediation("Please provide only one format for the VerificationCertStores. Refer to the Notation Verifier configuration guide: https://ratify.dev/docs/plugins/verifier/notation#configuration")
err := re.ErrorCodeConfigInvalid.WithDetail("The verificationCertStores is misconfigured with both legacy and new formats: %+v", conf).WithRemediation("Please provide only one format for the VerificationCertStores. Refer to the Notation Verifier configuration guide: https://ratify.dev/docs/plugins/verifier/notation#configuration")
logger.GetLogger(context.Background(), logOpt).Error(err)
return err

Copy link
Collaborator Author

@junczhu junczhu Sep 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

} else if !isCertStoresByType && isLegacyCertStore {
legacyCertStore, err := normalizeLegacyCertStore(conf)
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/config/config_v1beta1_verifier_notation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
verificationCertStores:
ca:
ca-certs:
- certstore-inline
- certstore-inline
trustPolicyDoc:
version: "1.0"
trustPolicies:
Expand Down
Loading