Skip to content

Automated fix for refs/heads/filewatcher #76

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

Open
wants to merge 1 commit into
base: filewatcher
Choose a base branch
from
Open

Automated fix for refs/heads/filewatcher #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace {

absl::Status ValidateRootCertificates(absl::string_view root_certificates) {
absl::StatusOr<std::vector<X509*>> parsed_roots =
grpc_core::ParsePemCertificateChain(root_certificates);
ParsePemCertificateChain(root_certificates);
if (!parsed_roots.ok()) {
return parsed_roots.status();
}
Expand All @@ -63,7 +63,7 @@ absl::Status ValidatePemKeyCertPair(absl::string_view cert_chain,
absl::string_view private_key) {
// Check that the cert chain consists of valid PEM blocks.
absl::StatusOr<std::vector<X509*>> parsed_certs =
grpc_core::ParsePemCertificateChain(cert_chain);
ParsePemCertificateChain(cert_chain);
if (!parsed_certs.ok()) {
return parsed_certs.status();
}
Expand All @@ -72,7 +72,7 @@ absl::Status ValidatePemKeyCertPair(absl::string_view cert_chain,
}
// Check that the private key consists of valid PEM blocks.
absl::StatusOr<EVP_PKEY*> parsed_private_key =
grpc_core::ParsePemPrivateKey(private_key);
ParsePemPrivateKey(private_key);
if (!parsed_private_key.ok()) {
return parsed_private_key.status();
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/common/tls_certificate_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FileWatcherCertificateProvider::Create(
const std::string& private_key_path,
const std::string& identity_certificate_path,
const std::string& root_cert_path, unsigned int refresh_interval_sec) {
auto provider = ::grpc_core::FileWatcherCertificateProvider::Create(
auto provider = grpc_core::FileWatcherCertificateProvider::Create(
private_key_path, identity_certificate_path, root_cert_path,
refresh_interval_sec);
if (!provider.ok()) {
Expand Down
4 changes: 2 additions & 2 deletions test/core/security/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,14 +438,14 @@ grpc_cc_test(
srcs = ["grpc_tls_certificate_provider_test.cc"],
data = [
"//src/core/tsi/test_creds:ca.pem",
"//src/core/tsi/test_creds:malformed-cert.pem",
"//src/core/tsi/test_creds:malformed-key.pem",
"//src/core/tsi/test_creds:multi-domain.key",
"//src/core/tsi/test_creds:multi-domain.pem",
"//src/core/tsi/test_creds:server0.key",
"//src/core/tsi/test_creds:server0.pem",
"//src/core/tsi/test_creds:server1.key",
"//src/core/tsi/test_creds:server1.pem",
"//src/core/tsi/test_creds:malformed-cert.pem",
"//src/core/tsi/test_creds:malformed-key.pem",
],
external_deps = [
"absl/log:check",
Expand Down
4 changes: 2 additions & 2 deletions test/cpp/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ grpc_cc_test(
srcs = ["credentials_test.cc"],
data = [
"//src/core/tsi/test_creds:ca.pem",
"//src/core/tsi/test_creds:server1.key",
"//src/core/tsi/test_creds:server1.pem",
"//src/core/tsi/test_creds:malformed-cert.pem",
"//src/core/tsi/test_creds:malformed-key.pem",
"//src/core/tsi/test_creds:server1.key",
"//src/core/tsi/test_creds:server1.pem",
],
external_deps = [
"absl/log:check",
Expand Down