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

Jump to bottom

[xDS] require EDS resource name in CDS resources with xdstp names #33425

Merged
merged 2 commits into from
Jun 14, 2023
Merged

[xDS] require EDS resource name in CDS resources with xdstp names #33425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
835768c
[xDS] require EDS resource name in CDS resources with xdstp names
markdroth Jun 13, 2023
570c302
Automated change: Fix sanity tests
markdroth Jun 13, 2023
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
42 changes: 26 additions & 16 deletions src/core/ext/xds/xds_cluster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
#include "absl/strings/strip.h"
Expand Down Expand Up @@ -187,23 +188,32 @@ XdsClusterResource::Eds EdsConfigParse(
if (eds_cluster_config == nullptr) {
errors->AddError("field not present");
} else {
ValidationErrors::ScopedField field(errors, ".eds_config");
const envoy_config_core_v3_ConfigSource* eds_config =
envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(
eds_cluster_config);
if (eds_config == nullptr) {
errors->AddError("field not present");
} else {
if (!envoy_config_core_v3_ConfigSource_has_ads(eds_config) &&
!envoy_config_core_v3_ConfigSource_has_self(eds_config)) {
errors->AddError("ConfigSource is not ads or self");
}
// Record EDS service_name (if any).
upb_StringView service_name =
envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name(
// Validate ConfigSource.
{
ValidationErrors::ScopedField field(errors, ".eds_config");
const envoy_config_core_v3_ConfigSource* eds_config =
envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(
eds_cluster_config);
if (service_name.size != 0) {
eds.eds_service_name = UpbStringToStdString(service_name);
if (eds_config == nullptr) {
errors->AddError("field not present");
} else {
if (!envoy_config_core_v3_ConfigSource_has_ads(eds_config) &&
!envoy_config_core_v3_ConfigSource_has_self(eds_config)) {
errors->AddError("ConfigSource is not ads or self");
}
}
}
// Record EDS service_name (if any).
// This field is required if the CDS resource has an xdstp name.
eds.eds_service_name = UpbStringToStdString(
envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name(
eds_cluster_config));
if (eds.eds_service_name.empty()) {
absl::string_view cluster_name =
UpbStringToAbsl(envoy_config_cluster_v3_Cluster_name(cluster));
if (absl::StartsWith(cluster_name, "xdstp:")) {
ValidationErrors::ScopedField field(errors, ".service_name");
errors->AddError("must be set if Cluster resource has an xdstp name");
}
}
}
Expand Down
22 changes: 22 additions & 0 deletions test/core/xds/xds_cluster_resource_type_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,28 @@ TEST_F(ClusterTypeTest, EdsServiceName) {
EXPECT_EQ(eds->eds_service_name, "bar");
}

TEST_F(ClusterTypeTest, EdsServiceNameAbsentWithXdstpName) {
Cluster cluster;
cluster.set_name("xdstp:foo");
cluster.set_type(cluster.EDS);
auto* eds_cluster_config = cluster.mutable_eds_cluster_config();
eds_cluster_config->mutable_eds_config()->mutable_self();
std::string serialized_resource;
ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
auto* resource_type = XdsClusterResourceType::Get();
auto decode_result =
resource_type->Decode(decode_context_, serialized_resource);
ASSERT_TRUE(decode_result.name.has_value());
EXPECT_EQ(*decode_result.name, "xdstp:foo");
EXPECT_EQ(decode_result.resource.status().code(),
absl::StatusCode::kInvalidArgument);
EXPECT_EQ(decode_result.resource.status().message(),
"errors validating Cluster resource: ["
"field:eds_cluster_config.service_name "
"error:must be set if Cluster resource has an xdstp name]")
<< decode_result.resource.status();
}

TEST_F(ClusterTypeTest, DiscoveryTypeNotPresent) {
Cluster cluster;
cluster.set_name("foo");
Expand Down
Loading