Changed SPIFFE credentials naming to TLS credentials, per Jiangtao's comments.

pull/19778/head
Matthew Stevenson 6 years ago
parent a3dde11f68
commit ff9697acd7
  1. 4
      include/grpcpp/security/credentials.h
  2. 4
      include/grpcpp/security/credentials_impl.h
  3. 6
      include/grpcpp/security/server_credentials.h
  4. 4
      include/grpcpp/security/server_credentials_impl.h
  5. 4
      src/cpp/client/secure_credentials.cc
  6. 2
      src/cpp/server/secure_server_credentials.cc

@ -132,9 +132,9 @@ static inline std::shared_ptr<grpc_impl::ChannelCredentials> LocalCredentials(
return ::grpc_impl::experimental::LocalCredentials(type);
}
static inline std::shared_ptr<grpc_impl::ChannelCredentials> SpiffeCredentials(
static inline std::shared_ptr<grpc_impl::ChannelCredentials> TlsCredentials(
const ::grpc_impl::experimental::TlsCredentialsOptions& options) {
return ::grpc_impl::experimental::SpiffeCredentials(options);
return ::grpc_impl::experimental::TlsCredentials(options);
}
} // namespace experimental

@ -337,8 +337,8 @@ std::shared_ptr<ChannelCredentials> AltsCredentials(
std::shared_ptr<ChannelCredentials> LocalCredentials(
grpc_local_connect_type type);
/// Builds SPIFFE Credentials given TLS options.
std::shared_ptr<ChannelCredentials> SpiffeCredentials(
/// Builds TLS Credentials given TLS options.
std::shared_ptr<ChannelCredentials> TlsCredentials(
const TlsCredentialsOptions& options);
} // namespace experimental

@ -79,10 +79,10 @@ static inline std::shared_ptr<ServerCredentials> LocalServerCredentials(
return ::grpc_impl::experimental::LocalServerCredentials(type);
}
/// Builds SPIFFE ServerCredentials given TLS options.
static inline std::shared_ptr<ServerCredentials> SpiffeServerCredentials(
/// Builds TLS ServerCredentials given TLS options.
static inline std::shared_ptr<ServerCredentials> TlsServerCredentials(
const ::grpc_impl::experimental::TlsCredentialsOptions& options) {
return ::grpc_impl::experimental::SpiffeServerCredentials(options);
return ::grpc_impl::experimental::TlsServerCredentials(options);
}
} // namespace experimental

@ -80,8 +80,8 @@ std::shared_ptr<ServerCredentials> AltsServerCredentials(
std::shared_ptr<ServerCredentials> LocalServerCredentials(
grpc_local_connect_type type);
/// Builds SPIFFE ServerCredentials given TLS options.
std::shared_ptr<ServerCredentials> SpiffeServerCredentials(
/// Builds TLS ServerCredentials given TLS options.
std::shared_ptr<ServerCredentials> TlsServerCredentials(
const TlsCredentialsOptions& options);
} // namespace experimental

@ -280,8 +280,8 @@ std::shared_ptr<ChannelCredentials> LocalCredentials(
return WrapChannelCredentials(grpc_local_credentials_create(type));
}
// Builds SPIFFE Credentials given TLS options.
std::shared_ptr<ChannelCredentials> SpiffeCredentials(
// Builds TLS Credentials given TLS options.
std::shared_ptr<ChannelCredentials> TlsCredentials(
const TlsCredentialsOptions& options) {
return WrapChannelCredentials(
grpc_tls_spiffe_credentials_create(options.c_credentials_options()));

@ -150,7 +150,7 @@ std::shared_ptr<ServerCredentials> LocalServerCredentials(
new SecureServerCredentials(grpc_local_server_credentials_create(type)));
}
std::shared_ptr<ServerCredentials> SpiffeServerCredentials(
std::shared_ptr<ServerCredentials> TlsServerCredentials(
const TlsCredentialsOptions& options) {
return std::shared_ptr<ServerCredentials>(
new SecureServerCredentials(grpc_tls_spiffe_server_credentials_create(

Loading…
Cancel
Save