Skip to content

grpc_credentials: remove well_known_names #16693

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

Merged
mattklein123 merged 1 commit into from
May 27, 2021
Merged

grpc_credentials: remove well_known_names #16693

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
1 change: 0 additions & 1 deletion source/extensions/bootstrap/wasm/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ envoy_cc_extension(
"//source/common/config:datasource_lib",
"//source/common/protobuf:utility_lib",
"//source/extensions/common/wasm:wasm_lib",
"//source/extensions/grpc_credentials:well_known_names",
"@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto",
],
)
19 changes: 0 additions & 19 deletions source/extensions/grpc_credentials/BUILD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion source/extensions/grpc_credentials/aws_iam/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ envoy_cc_extension(
"//source/extensions/common/aws:region_provider_impl_lib",
"//source/extensions/common/aws:signer_impl_lib",
"//source/extensions/common/aws:utility_lib",
"//source/extensions/grpc_credentials:well_known_names",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
"@envoy_api//envoy/config/grpc_credential/v3:pkg_cc_proto",
],
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/grpc_credentials/aws_iam/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ std::shared_ptr<grpc::ChannelCredentials> AwsIamGrpcCredentialsFactory::getChann
switch (credential.credential_specifier_case()) {
case envoy::config::core::v3::GrpcService::GoogleGrpc::CallCredentials::
CredentialSpecifierCase::kFromPlugin: {
if (credential.from_plugin().name() == GrpcCredentialsNames::get().AwsIam) {
if (credential.from_plugin().name() == "envoy.grpc_credentials.aws_iam") {
AwsIamGrpcCredentialsFactory credentials_factory;
// We don't deal with validation failures here at runtime today, see
// https://github.com/envoyproxy/envoy/issues/8010.
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/grpc_credentials/aws_iam/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "common/http/message_impl.h"

#include "extensions/common/aws/signer.h"
#include "extensions/grpc_credentials/well_known_names.h"

namespace Envoy {
namespace Extensions {
Expand All @@ -28,7 +27,7 @@ class AwsIamGrpcCredentialsFactory : public Grpc::GoogleGrpcCredentialsFactory {
return std::make_unique<envoy::config::grpc_credential::v3::AwsIamConfig>();
}

std::string name() const override { return GrpcCredentialsNames::get().AwsIam; }
std::string name() const override { return "envoy.grpc_credentials.aws_iam"; }

private:
static std::string getRegion(const envoy::config::grpc_credential::v3::AwsIamConfig& config);
Expand Down
1 change: 0 additions & 1 deletion source/extensions/grpc_credentials/example/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ envoy_cc_library(
"//include/envoy/registry",
"//source/common/common:assert_lib",
"//source/common/grpc:google_grpc_creds_lib",
"//source/extensions/grpc_credentials:well_known_names",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
],
)
4 changes: 1 addition & 3 deletions source/extensions/grpc_credentials/example/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#include "envoy/config/core/v3/grpc_service.pb.h"
#include "envoy/grpc/google_grpc_creds.h"

#include "extensions/grpc_credentials/well_known_names.h"

namespace Envoy {
namespace Extensions {
namespace GrpcCredentials {
Expand Down Expand Up @@ -32,7 +30,7 @@ class AccessTokenExampleGrpcCredentialsFactory : public Grpc::GoogleGrpcCredenti
getChannelCredentials(const envoy::config::core::v3::GrpcService& grpc_service_config,
Api::Api& api) override;

std::string name() const override { return GrpcCredentialsNames::get().AccessTokenExample; }
std::string name() const override { return "envoy.grpc_credentials.access_token_example"; }
};

/*
Expand Down
1 change: 0 additions & 1 deletion source/extensions/grpc_credentials/file_based_metadata/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ envoy_cc_extension(
"//source/common/config:utility_lib",
"//source/common/grpc:common_lib",
"//source/common/grpc:google_grpc_creds_lib",
"//source/extensions/grpc_credentials:well_known_names",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
"@envoy_api//envoy/config/grpc_credential/v3:pkg_cc_proto",
],
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/grpc_credentials/file_based_metadata/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ FileBasedMetadataGrpcCredentialsFactory::getChannelCredentials(
switch (credential.credential_specifier_case()) {
case envoy::config::core::v3::GrpcService::GoogleGrpc::CallCredentials::
CredentialSpecifierCase::kFromPlugin: {
if (credential.from_plugin().name() == GrpcCredentialsNames::get().FileBasedMetadata) {
if (credential.from_plugin().name() == "envoy.grpc_credentials.file_based_metadata") {
FileBasedMetadataGrpcCredentialsFactory file_based_metadata_credentials_factory;
// We don't deal with validation failures here at runtime today, see
// https://github.com/envoyproxy/envoy/issues/8010.
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/grpc_credentials/file_based_metadata/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

#include "common/protobuf/protobuf.h"

#include "extensions/grpc_credentials/well_known_names.h"

namespace Envoy {
namespace Extensions {
namespace GrpcCredentials {
Expand All @@ -32,7 +30,7 @@ class FileBasedMetadataGrpcCredentialsFactory : public Grpc::GoogleGrpcCredentia
return std::make_unique<envoy::config::grpc_credential::v3::FileBasedMetadataConfig>();
}

std::string name() const override { return GrpcCredentialsNames::get().FileBasedMetadata; }
std::string name() const override { return "envoy.grpc_credentials.file_based_metadata"; }
};

class FileBasedMetadataAuthenticator : public grpc::MetadataCredentialsPlugin {
Expand Down
29 changes: 0 additions & 29 deletions source/extensions/grpc_credentials/well_known_names.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/common/grpc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ envoy_cc_test(
deps = [
":grpc_client_integration_test_harness_lib",
"//source/common/grpc:async_client_lib",
"//source/extensions/grpc_credentials:well_known_names",
"//source/extensions/grpc_credentials/example:config",
] + envoy_select_google_grpc(["//source/common/grpc:google_async_client_lib"]),
)
Expand Down
17 changes: 5 additions & 12 deletions test/common/grpc/grpc_client_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#include "common/grpc/google_async_client_impl.h"

#include "extensions/grpc_credentials/well_known_names.h"

#endif

#include "test/common/grpc/grpc_client_integration_test_harness.h"
Expand Down Expand Up @@ -452,8 +450,7 @@ INSTANTIATE_TEST_SUITE_P(SslIpVersionsClientType, GrpcAccessTokenClientIntegrati
TEST_P(GrpcAccessTokenClientIntegrationTest, AccessTokenAuthRequest) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
access_token_value_ = "accesstokenvalue";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().AccessTokenExample;
credentials_factory_name_ = "envoy.grpc_credentials.access_token_example";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -464,8 +461,7 @@ TEST_P(GrpcAccessTokenClientIntegrationTest, AccessTokenAuthRequest) {
TEST_P(GrpcAccessTokenClientIntegrationTest, AccessTokenAuthStream) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
access_token_value_ = "accesstokenvalue";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().AccessTokenExample;
credentials_factory_name_ = "envoy.grpc_credentials.access_token_example";
initialize();
auto stream = createStream(empty_metadata_);
stream->sendServerInitialMetadata(empty_metadata_);
Expand All @@ -480,8 +476,7 @@ TEST_P(GrpcAccessTokenClientIntegrationTest, MultipleAccessTokens) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
access_token_value_ = "accesstokenvalue";
access_token_value_2_ = "accesstokenvalue2";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().AccessTokenExample;
credentials_factory_name_ = "envoy.grpc_credentials.access_token_example";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -493,8 +488,7 @@ TEST_P(GrpcAccessTokenClientIntegrationTest, ExtraCredentialParams) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
access_token_value_ = "accesstokenvalue";
refresh_token_value_ = "refreshtokenvalue";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().AccessTokenExample;
credentials_factory_name_ = "envoy.grpc_credentials.access_token_example";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -504,8 +498,7 @@ TEST_P(GrpcAccessTokenClientIntegrationTest, ExtraCredentialParams) {
// Validate that no access token still works
TEST_P(GrpcAccessTokenClientIntegrationTest, NoAccessTokens) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().AccessTokenExample;
credentials_factory_name_ = "envoy.grpc_credentials.access_token_example";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand Down
1 change: 0 additions & 1 deletion test/extensions/grpc_credentials/aws_iam/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ envoy_cc_test(
srcs = envoy_select_google_grpc(["aws_iam_grpc_credentials_test.cc"]),
data = ["//test/config/integration/certs"],
deps = [
"//source/extensions/grpc_credentials:well_known_names",
"//source/extensions/grpc_credentials/aws_iam:config",
"//test/common/grpc:grpc_client_integration_test_harness_lib",
"//test/integration:integration_lib",
Expand Down
10 changes: 4 additions & 6 deletions test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#include "common/common/utility.h"
#include "common/grpc/google_async_client_impl.h"

#include "extensions/grpc_credentials/well_known_names.h"

#include "test/common/grpc/grpc_client_integration_test_harness.h"
#include "test/integration/fake_upstream.h"
#include "test/test_common/environment.h"
Expand Down Expand Up @@ -122,7 +120,7 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_ConfigRegion) {
service_name_ = "test_service";
region_name_ = "test_region_static";
region_location_ = RegionLocation::InConfig;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
credentials_factory_name_ = "envoy.grpc_credentials.aws_iam";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -134,7 +132,7 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_EnvRegion) {
service_name_ = "test_service";
region_name_ = "test_region_env";
region_location_ = RegionLocation::InEnvironment;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
credentials_factory_name_ = "envoy.grpc_credentials.aws_iam";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -146,14 +144,14 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_NoRegion) {
service_name_ = "test_service";
region_name_ = "test_region_env";
region_location_ = RegionLocation::NotProvided;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
credentials_factory_name_ = "envoy.grpc_credentials.aws_iam";
EXPECT_THROW_WITH_REGEX(initialize();, EnvoyException, "AWS region");
}

TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_UnexpectedCallCredentials) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
call_credentials_ = CallCredentials::AccessToken;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
credentials_factory_name_ = "envoy.grpc_credentials.aws_iam";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand Down
1 change: 0 additions & 1 deletion test/extensions/grpc_credentials/file_based_metadata/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ envoy_cc_test(
srcs = ["integration_test.cc"],
data = ["//test/config/integration/certs"],
deps = [
"//source/extensions/grpc_credentials:well_known_names",
"//source/extensions/grpc_credentials/file_based_metadata:config",
"//test/common/grpc:grpc_client_integration_test_harness_lib",
"//test/integration:integration_lib",
Expand Down
13 changes: 4 additions & 9 deletions test/extensions/grpc_credentials/file_based_metadata/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "common/grpc/google_async_client_impl.h"

#include "extensions/grpc_credentials/file_based_metadata/config.h"
#include "extensions/grpc_credentials/well_known_names.h"

#include "test/common/grpc/grpc_client_integration_test_harness.h"
#include "test/integration/fake_upstream.h"
Expand Down Expand Up @@ -90,8 +89,7 @@ TEST_P(GrpcFileBasedMetadataClientIntegrationTest, FileBasedMetadataGrpcAuthRequ
header_key_1_ = "header1";
header_prefix_1_ = "prefix1";
header_value_1_ = "secretvalue";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().FileBasedMetadata;
credentials_factory_name_ = "envoy.grpc_credentials.file_based_metadata";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -105,8 +103,7 @@ TEST_P(GrpcFileBasedMetadataClientIntegrationTest, DoubleFileBasedMetadataGrpcAu
header_prefix_1_ = "prefix1";
header_value_1_ = "secretvalue";
header_value_2_ = "secret2";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().FileBasedMetadata;
credentials_factory_name_ = "envoy.grpc_credentials.file_based_metadata";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -116,8 +113,7 @@ TEST_P(GrpcFileBasedMetadataClientIntegrationTest, DoubleFileBasedMetadataGrpcAu
// Validate that FileBasedMetadata auth plugin works without a config loaded
TEST_P(GrpcFileBasedMetadataClientIntegrationTest, EmptyFileBasedMetadataGrpcAuthRequest) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().FileBasedMetadata;
credentials_factory_name_ = "envoy.grpc_credentials.file_based_metadata";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand All @@ -131,8 +127,7 @@ TEST_P(GrpcFileBasedMetadataClientIntegrationTest, ExtraConfigFileBasedMetadataG
header_key_1_ = "header1";
header_prefix_1_ = "prefix1";
header_value_1_ = "secretvalue";
credentials_factory_name_ =
Extensions::GrpcCredentials::GrpcCredentialsNames::get().FileBasedMetadata;
credentials_factory_name_ = "envoy.grpc_credentials.file_based_metadata";
initialize();
auto request = createRequest(empty_metadata_);
request->sendReply();
Expand Down