From 34a32d4ce547d876da962a3eee925decff003aca Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Mon, 29 Jan 2024 15:08:31 -0500 Subject: [PATCH] Remove V2 PeerName field from pbresource.Tenancy (#19865) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The peer name will eventually show up elsewhere in the resource. For now though this rips it out of where we don’t want it to be. --- agent/consul/fsm/commands_ce_test.go | 1 - agent/consul/fsm/snapshot_test.go | 1 - .../grpc-external/services/resource/server.go | 11 - .../services/resource/server_test.go | 19 - .../grpc-external/services/resource/watch.go | 6 +- .../resource/write_mav_common_test.go | 14 - .../services/resource/write_status.go | 2 - agent/xds/proxystateconverter/clusters.go | 3 +- agent/xds/proxystateconverter/converter.go | 5 +- agent/xds/proxystateconverter/listeners.go | 3 +- ...destinations-tproxy-default-default.golden | 138 ++--- ...4-multi-destination-default-default.golden | 256 ++++----- ...destinations-tproxy-default-default.golden | 138 ++--- ...p-port-bind-address-default-default.golden | 136 ++--- ...socket-bind-address-default-default.golden | 68 +-- ...-destination-tproxy-default-default.golden | 78 +-- ...d-multi-destination-default-default.golden | 336 ++++++------ ...destinations-tproxy-default-default.golden | 378 ++++++------- ...-destination-tproxy-default-default.golden | 198 +++---- ...le-workloads-tproxy-default-default.golden | 198 +++---- .../l7-expose-paths-default-default.golden | 90 +-- ...inbound-connections-default-default.golden | 130 ++--- ...with-specific-ports-default-default.golden | 124 ++--- ...esses-without-ports-default-default.golden | 124 ++--- ...with-specific-ports-default-default.golden | 56 +- ...esses-without-ports-default-default.golden | 56 +- ...with-only-mesh-port-default-default.golden | 14 +- ...with-specific-ports-default-default.golden | 66 +-- ...esses-without-ports-default-default.golden | 100 ++-- ...dress-without-ports-default-default.golden | 124 ++--- ...destinations-tproxy-default-default.golden | 48 +- ...4-multi-destination-default-default.golden | 88 +-- ...destinations-tproxy-default-default.golden | 48 +- ...p-port-bind-address-default-default.golden | 48 +- ...socket-bind-address-default-default.golden | 28 +- ...-destination-tproxy-default-default.golden | 28 +- ...d-multi-destination-default-default.golden | 88 +-- ...destinations-tproxy-default-default.golden | 128 ++--- ...-destination-tproxy-default-default.golden | 68 +-- ...le-workloads-tproxy-default-default.golden | 68 +-- .../l7-expose-paths-default-default.golden | 6 +- ...inbound-connections-default-default.golden | 6 +- ...with-specific-ports-default-default.golden | 6 +- ...esses-without-ports-default-default.golden | 6 +- ...with-specific-ports-default-default.golden | 6 +- ...esses-without-ports-default-default.golden | 6 +- ...with-only-mesh-port-default-default.golden | 6 +- ...with-specific-ports-default-default.golden | 6 +- ...esses-without-ports-default-default.golden | 6 +- ...dress-without-ports-default-default.golden | 6 +- ...destinations-tproxy-default-default.golden | 100 ++-- ...4-multi-destination-default-default.golden | 148 ++--- ...destinations-tproxy-default-default.golden | 94 ++-- ...p-port-bind-address-default-default.golden | 50 +- ...socket-bind-address-default-default.golden | 36 +- ...-destination-tproxy-default-default.golden | 68 +-- ...d-multi-destination-default-default.golden | 130 ++--- ...destinations-tproxy-default-default.golden | 238 ++++---- ...-destination-tproxy-default-default.golden | 136 ++--- ...le-workloads-tproxy-default-default.golden | 136 ++--- .../l7-expose-paths-default-default.golden | 214 ++++---- ...inbound-connections-default-default.golden | 330 +++++------ ...with-specific-ports-default-default.golden | 448 +++++++-------- ...esses-without-ports-default-default.golden | 376 ++++++------- ...with-specific-ports-default-default.golden | 144 ++--- ...esses-without-ports-default-default.golden | 144 ++--- ...with-only-mesh-port-default-default.golden | 44 +- ...with-specific-ports-default-default.golden | 214 ++++---- ...esses-without-ports-default-default.golden | 320 +++++------ ...dress-without-ports-default-default.golden | 376 ++++++------- ...destinations-tproxy-default-default.golden | 6 +- ...4-multi-destination-default-default.golden | 6 +- ...destinations-tproxy-default-default.golden | 6 +- ...p-port-bind-address-default-default.golden | 6 +- ...socket-bind-address-default-default.golden | 6 +- ...-destination-tproxy-default-default.golden | 6 +- ...d-multi-destination-default-default.golden | 70 +-- ...destinations-tproxy-default-default.golden | 52 +- ...-destination-tproxy-default-default.golden | 30 +- ...le-workloads-tproxy-default-default.golden | 30 +- .../l7-expose-paths-default-default.golden | 6 +- ...inbound-connections-default-default.golden | 6 +- ...with-specific-ports-default-default.golden | 6 +- ...esses-without-ports-default-default.golden | 6 +- ...with-specific-ports-default-default.golden | 6 +- ...esses-without-ports-default-default.golden | 6 +- ...with-only-mesh-port-default-default.golden | 6 +- ...with-specific-ports-default-default.golden | 6 +- ...esses-without-ports-default-default.golden | 6 +- ...dress-without-ports-default-default.golden | 6 +- command/resource/apply-grpc/apply_test.go | 4 +- command/resource/apply/apply.go | 2 - command/resource/apply/apply_test.go | 8 +- command/resource/client/client.go | 7 +- command/resource/delete-grpc/delete.go | 1 - command/resource/delete/delete.go | 22 +- command/resource/delete/delete_test.go | 4 +- command/resource/helper.go | 3 +- command/resource/helper_test.go | 7 +- command/resource/list-grpc/list.go | 1 - command/resource/list/list.go | 10 +- command/resource/list/list_test.go | 4 - command/resource/read-grpc/read.go | 1 - command/resource/read/read.go | 10 +- command/resource/read/read_test.go | 4 +- command/resource/resource.go | 4 +- command/resource/testdata/demo.hcl | 1 - command/resource/testdata/invalid.hcl | 1 - command/resource/testdata/invalid_type.hcl | 1 - .../controller-architecture/guide.md | 1 - .../trafficpermissions/controller_test.go | 36 +- .../internal/types/traffic_permissions.go | 18 +- .../types/traffic_permissions_test.go | 14 +- .../v2beta1/api-service.json | 5 +- .../v2beta1/api-workload-1-health.json | 8 +- .../v2beta1/api-workload-1.json | 5 +- .../v2beta1/api-workload-10-health.json | 8 +- .../v2beta1/api-workload-10.json | 5 +- .../v2beta1/api-workload-11-health.json | 8 +- .../v2beta1/api-workload-11.json | 5 +- .../v2beta1/api-workload-12-health.json | 8 +- .../v2beta1/api-workload-12.json | 5 +- .../v2beta1/api-workload-13-health.json | 8 +- .../v2beta1/api-workload-13.json | 5 +- .../v2beta1/api-workload-14-health.json | 8 +- .../v2beta1/api-workload-14.json | 5 +- .../v2beta1/api-workload-15-health.json | 8 +- .../v2beta1/api-workload-15.json | 5 +- .../v2beta1/api-workload-16-health.json | 8 +- .../v2beta1/api-workload-16.json | 5 +- .../v2beta1/api-workload-17-health.json | 8 +- .../v2beta1/api-workload-17.json | 5 +- .../v2beta1/api-workload-18-health.json | 8 +- .../v2beta1/api-workload-18.json | 5 +- .../v2beta1/api-workload-19-health.json | 8 +- .../v2beta1/api-workload-19.json | 5 +- .../v2beta1/api-workload-2-health.json | 8 +- .../v2beta1/api-workload-2.json | 5 +- .../v2beta1/api-workload-20-health.json | 8 +- .../v2beta1/api-workload-20.json | 5 +- .../v2beta1/api-workload-3-health.json | 8 +- .../v2beta1/api-workload-3.json | 5 +- .../v2beta1/api-workload-4-health.json | 8 +- .../v2beta1/api-workload-4.json | 5 +- .../v2beta1/api-workload-5-health.json | 8 +- .../v2beta1/api-workload-5.json | 5 +- .../v2beta1/api-workload-6-health.json | 8 +- .../v2beta1/api-workload-6.json | 5 +- .../v2beta1/api-workload-7-health.json | 8 +- .../v2beta1/api-workload-7.json | 5 +- .../v2beta1/api-workload-8-health.json | 8 +- .../v2beta1/api-workload-8.json | 5 +- .../v2beta1/api-workload-9-health.json | 8 +- .../v2beta1/api-workload-9.json | 5 +- .../v2beta1/foo-service-endpoints.json | 8 +- .../v2beta1/foo-service.json | 5 +- .../v2beta1/grpc-api-service.json | 5 +- .../v2beta1/http-api-service.json | 5 +- .../v2beta1/node-1-health.json | 8 +- .../integration_test_data/v2beta1/node-1.json | 5 +- .../v2beta1/node-2-health.json | 8 +- .../integration_test_data/v2beta1/node-2.json | 5 +- .../v2beta1/node-3-health.json | 8 +- .../integration_test_data/v2beta1/node-3.json | 5 +- .../v2beta1/node-4-health.json | 8 +- .../integration_test_data/v2beta1/node-4.json | 5 +- .../controllers/failover/controller.go | 1 - .../catalog/internal/types/failover_policy.go | 27 +- .../internal/types/health_checks_test.go | 1 - .../internal/types/health_status_test.go | 2 - .../internal/types/node_health_status_test.go | 2 - internal/catalog/internal/types/node_test.go | 1 - .../internal/types/service_endpoints_test.go | 2 - .../catalog/internal/types/service_test.go | 1 - internal/catalog/internal/types/validators.go | 17 +- .../catalog/internal/types/validators_test.go | 15 +- .../internal/types/virtual_ips_test.go | 1 - .../catalog/internal/types/workload_test.go | 1 - .../catalog/workloadselector/index_test.go | 4 - internal/controller/controller.go | 3 +- internal/controller/dependency/simple_test.go | 2 - internal/controller/mem_consistency_test.go | 3 - internal/controller/runner.go | 4 +- .../controllers/routes/controller_test.go | 2 +- .../controllers/routes/generate_test.go | 2 +- .../controllers/routes/sort_rules_test.go | 1 - .../sidecarproxy/builder/builder.go | 6 +- .../sidecarproxy/builder/destinations.go | 3 +- .../sidecarproxy/builder/local_app.go | 6 +- .../sidecarproxy/builder/naming.go | 9 +- ...cit-destinations-tproxy-default-bar.golden | 13 +- ...destinations-tproxy-default-default.golden | 13 +- ...xplicit-destinations-tproxy-foo-bar.golden | 13 +- ...cit-destinations-tproxy-foo-default.golden | 13 +- .../l4-multi-destination-default-bar.golden | 25 +- ...4-multi-destination-default-default.golden | 25 +- .../l4-multi-destination-foo-bar.golden | 25 +- .../l4-multi-destination-foo-default.golden | 25 +- ...cit-destinations-tproxy-default-bar.golden | 11 +- ...destinations-tproxy-default-default.golden | 11 +- ...mplicit-destinations-tproxy-foo-bar.golden | 11 +- ...cit-destinations-tproxy-foo-default.golden | 11 +- ...on-ip-port-bind-address-default-bar.golden | 13 +- ...p-port-bind-address-default-default.golden | 13 +- ...nation-ip-port-bind-address-foo-bar.golden | 13 +- ...on-ip-port-bind-address-foo-default.golden | 13 +- ...nix-socket-bind-address-default-bar.golden | 10 +- ...socket-bind-address-default-default.golden | 10 +- ...on-unix-socket-bind-address-foo-bar.golden | 10 +- ...nix-socket-bind-address-foo-default.golden | 10 +- ...icit-destination-tproxy-default-bar.golden | 8 +- ...-destination-tproxy-default-default.golden | 8 +- ...implicit-destination-tproxy-foo-bar.golden | 8 +- ...icit-destination-tproxy-foo-default.golden | 8 +- ...mixed-multi-destination-default-bar.golden | 32 +- ...d-multi-destination-default-default.golden | 32 +- .../mixed-multi-destination-foo-bar.golden | 32 +- ...mixed-multi-destination-foo-default.golden | 32 +- ...cit-destinations-tproxy-default-bar.golden | 35 +- ...destinations-tproxy-default-default.golden | 35 +- ...mplicit-destinations-tproxy-foo-bar.golden | 35 +- ...cit-destinations-tproxy-foo-default.golden | 35 +- ...icit-destination-tproxy-default-bar.golden | 20 +- ...-destination-tproxy-default-default.golden | 20 +- ...implicit-destination-tproxy-foo-bar.golden | 20 +- ...icit-destination-tproxy-foo-default.golden | 20 +- ...ltiple-workloads-tproxy-default-bar.golden | 20 +- ...le-workloads-tproxy-default-default.golden | 20 +- ...h-multiple-workloads-tproxy-foo-bar.golden | 20 +- ...ltiple-workloads-tproxy-foo-default.golden | 20 +- .../source/l7-expose-paths-default-bar.golden | 5 +- .../l7-expose-paths-default-default.golden | 5 +- .../source/l7-expose-paths-foo-bar.golden | 5 +- .../source/l7-expose-paths-foo-default.golden | 5 +- .../testdata/source/l7-expose-paths.golden | 5 +- ...and-inbound-connections-default-bar.golden | 5 +- ...inbound-connections-default-default.golden | 5 +- ...cal-and-inbound-connections-foo-bar.golden | 5 +- ...and-inbound-connections-foo-default.golden | 5 +- .../local-and-inbound-connections.golden | 5 +- ...ses-with-specific-ports-default-bar.golden | 5 +- ...with-specific-ports-default-default.golden | 5 +- ...dresses-with-specific-ports-foo-bar.golden | 5 +- ...ses-with-specific-ports-foo-default.golden | 5 +- ...kload-addresses-with-specific-ports.golden | 5 +- ...addresses-without-ports-default-bar.golden | 5 +- ...esses-without-ports-default-default.golden | 5 +- ...oad-addresses-without-ports-foo-bar.golden | 5 +- ...addresses-without-ports-foo-default.golden | 5 +- ...le-workload-addresses-without-ports.golden | 5 +- ...ses-with-specific-ports-default-bar.golden | 5 +- ...with-specific-ports-default-default.golden | 5 +- ...dresses-with-specific-ports-foo-bar.golden | 5 +- ...ses-with-specific-ports-foo-default.golden | 5 +- ...kload-addresses-with-specific-ports.golden | 5 +- ...addresses-without-ports-default-bar.golden | 5 +- ...esses-without-ports-default-default.golden | 5 +- ...oad-addresses-without-ports-foo-bar.golden | 5 +- ...addresses-without-ports-foo-default.golden | 5 +- ...le-workload-addresses-without-ports.golden | 5 +- ...d-address-without-ports-default-bar.golden | 5 +- ...dress-without-ports-default-default.golden | 5 +- ...kload-address-without-ports-foo-bar.golden | 5 +- ...d-address-without-ports-foo-default.golden | 5 +- ...ngle-workload-address-without-ports.golden | 5 +- ...oad-with-only-mesh-port-default-bar.golden | 5 +- ...with-only-mesh-port-default-default.golden | 5 +- ...orkload-with-only-mesh-port-foo-bar.golden | 5 +- ...oad-with-only-mesh-port-foo-default.golden | 5 +- ...ort-l4-workload-with-only-mesh-port.golden | 5 +- ...ses-with-specific-ports-default-bar.golden | 5 +- ...with-specific-ports-default-default.golden | 5 +- ...dresses-with-specific-ports-foo-bar.golden | 5 +- ...ses-with-specific-ports-foo-default.golden | 5 +- ...kload-addresses-with-specific-ports.golden | 5 +- ...addresses-without-ports-default-bar.golden | 5 +- ...esses-without-ports-default-default.golden | 5 +- ...oad-addresses-without-ports-foo-bar.golden | 5 +- ...addresses-without-ports-foo-default.golden | 5 +- ...le-workload-addresses-without-ports.golden | 5 +- ...d-address-without-ports-default-bar.golden | 5 +- ...dress-without-ports-default-default.golden | 5 +- ...kload-address-without-ports-foo-bar.golden | 5 +- ...d-address-without-ports-foo-default.golden | 5 +- ...ngle-workload-address-without-ports.golden | 5 +- ...d-address-without-ports-default-bar.golden | 5 +- ...dress-without-ports-default-default.golden | 5 +- ...kload-address-without-ports-foo-bar.golden | 5 +- ...d-address-without-ports-foo-default.golden | 5 +- ...ngle-workload-address-without-ports.golden | 5 +- .../controllers/sidecarproxy/cache/cache.go | 1 - .../sidecarproxy/controller_test.go | 2 +- .../sidecarproxy/fetcher/data_fetcher.go | 1 - .../internal/controllers/xds/controller.go | 2 +- .../controllers/xds/controller_test.go | 2 +- ...destinations-tproxy-default-default.golden | 5 +- ...4-multi-destination-default-default.golden | 11 +- ...destinations-tproxy-default-default.golden | 3 +- ...p-port-bind-address-default-default.golden | 5 +- ...socket-bind-address-default-default.golden | 5 +- ...-destination-tproxy-default-default.golden | 3 +- ...d-multi-destination-default-default.golden | 15 +- ...destinations-tproxy-default-default.golden | 15 +- ...-destination-tproxy-default-default.golden | 9 +- ...le-workloads-tproxy-default-default.golden | 9 +- .../l7-expose-paths-default-default.golden | 3 +- .../testdata/source/l7-expose-paths.golden | 5 +- ...inbound-connections-default-default.golden | 3 +- .../local-and-inbound-connections.golden | 5 +- ...with-specific-ports-default-default.golden | 3 +- ...kload-addresses-with-specific-ports.golden | 5 +- ...esses-without-ports-default-default.golden | 3 +- ...le-workload-addresses-without-ports.golden | 5 +- ...with-specific-ports-default-default.golden | 3 +- ...kload-addresses-with-specific-ports.golden | 5 +- ...esses-without-ports-default-default.golden | 3 +- ...le-workload-addresses-without-ports.golden | 5 +- ...ngle-workload-address-without-ports.golden | 5 +- ...with-only-mesh-port-default-default.golden | 3 +- ...ort-l4-workload-with-only-mesh-port.golden | 5 +- ...with-specific-ports-default-default.golden | 3 +- ...kload-addresses-with-specific-ports.golden | 5 +- ...esses-without-ports-default-default.golden | 3 +- ...le-workload-addresses-without-ports.golden | 5 +- ...ngle-workload-address-without-ports.golden | 5 +- ...dress-without-ports-default-default.golden | 3 +- ...ngle-workload-address-without-ports.golden | 5 +- internal/mesh/internal/types/destinations.go | 9 +- .../mesh/internal/types/destinations_test.go | 15 +- internal/mesh/internal/types/xroute_test.go | 8 +- .../proxy-tracker/proxy_state_exports_test.go | 1 - .../exportedservices/controller.go | 4 - .../exportedservices/controller_test.go | 14 +- .../multicluster/internal/types/helpers.go | 3 +- internal/resource/authz.go | 4 +- internal/resource/authz_ce.go | 5 +- internal/resource/authz_ce_test.go | 14 +- internal/resource/equality.go | 3 +- internal/resource/equality_test.go | 53 +- internal/resource/errors.go | 14 +- internal/resource/http/http.go | 8 +- internal/resource/http/http_test.go | 1 - .../selectiontracker/selection_tracker.go | 6 +- .../selection_tracker_test.go | 8 - internal/resource/refkey.go | 10 +- internal/resource/refkey_test.go | 4 +- internal/resource/resourcetest/tenancy.go | 11 +- internal/resource/sort.go | 4 - internal/resource/sort_test.go | 37 +- internal/resource/stringer.go | 2 +- internal/resource/tenancy.go | 23 +- internal/resource/tenancy_test.go | 2 +- internal/storage/conformance/conformance.go | 53 +- internal/storage/inmem/schema.go | 20 +- internal/storage/inmem/snapshot_test.go | 2 - internal/storage/inmem/store.go | 2 +- internal/storage/inmem/watch.go | 5 +- .../controllers/namespace/controller.go | 1 - .../tenancytest/namespace_controller_test.go | 3 - .../v2beta1/traffic_permissions_addon.go | 2 +- .../v2beta1/failover_policy_extras_test.go | 1 - .../pbmesh/v2beta1/xroute_addons_test.go | 1 - proto-public/pbresource/resource.pb.go | 511 +++++++++--------- proto-public/pbresource/resource.proto | 7 - .../explicit_destinations_l7_test.go | 1 - .../catalogv2/explicit_destinations_test.go | 1 - testing/deployer/topology/compile.go | 10 +- testing/deployer/util/v2.go | 13 +- .../multiport/reference/resource-command.mdx | 8 +- 369 files changed, 4848 insertions(+), 5499 deletions(-) diff --git a/agent/consul/fsm/commands_ce_test.go b/agent/consul/fsm/commands_ce_test.go index 445f4c0190..c24dd2ea8f 100644 --- a/agent/consul/fsm/commands_ce_test.go +++ b/agent/consul/fsm/commands_ce_test.go @@ -1539,7 +1539,6 @@ func TestFSM_Resources(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "default", - PeerName: "local", Namespace: "default", }, Name: "bar", diff --git a/agent/consul/fsm/snapshot_test.go b/agent/consul/fsm/snapshot_test.go index 3a8bd7200d..de4e64e344 100644 --- a/agent/consul/fsm/snapshot_test.go +++ b/agent/consul/fsm/snapshot_test.go @@ -566,7 +566,6 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "default", - PeerName: "local", Namespace: "default", }, Name: "bar", diff --git a/agent/grpc-external/services/resource/server.go b/agent/grpc-external/services/resource/server.go index 87c134f0ae..cbbe35d1d1 100644 --- a/agent/grpc-external/services/resource/server.go +++ b/agent/grpc-external/services/resource/server.go @@ -153,8 +153,6 @@ func validateId(id *pbresource.ID, errorPrefix string) error { id.Tenancy = &pbresource.Tenancy{ Partition: "", Namespace: "", - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - PeerName: "local", } } @@ -168,10 +166,6 @@ func validateId(id *pbresource.ID, errorPrefix string) error { return status.Errorf(codes.InvalidArgument, "%s.tenancy.namespace invalid: %v", errorPrefix, err) } } - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - if id.Tenancy.PeerName == "" { - id.Tenancy.PeerName = resource.DefaultPeerName - } return nil } @@ -214,11 +208,6 @@ func validateWildcardTenancy(tenancy *pbresource.Tenancy, namePrefix string) err return status.Errorf(codes.InvalidArgument, "name_prefix invalid: must be lowercase alphanumeric, got: %v", namePrefix) } - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - if tenancy.PeerName == "" { - tenancy.PeerName = resource.DefaultPeerName - } - return nil } diff --git a/agent/grpc-external/services/resource/server_test.go b/agent/grpc-external/services/resource/server_test.go index 652b76059b..05145298aa 100644 --- a/agent/grpc-external/services/resource/server_test.go +++ b/agent/grpc-external/services/resource/server_test.go @@ -152,7 +152,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "", Namespace: resource.DefaultNamespaceName, - PeerName: "local", }, }, "namespaced type with empty namespace": { @@ -160,16 +159,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: resource.DefaultPartitionName, Namespace: "", - PeerName: "local", - }, - }, - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - "namespaced type with empty peername": { - typ: demo.TypeV2Artist, - tenancy: &pbresource.Tenancy{ - Partition: resource.DefaultPartitionName, - Namespace: resource.DefaultNamespaceName, - PeerName: "", }, }, "namespaced type with empty partition and namespace": { @@ -177,7 +166,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "", Namespace: "", - PeerName: "local", }, }, "namespaced type with wildcard partition and empty namespace": { @@ -185,7 +173,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "*", Namespace: "", - PeerName: "local", }, }, "namespaced type with empty partition and wildcard namespace": { @@ -193,7 +180,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "", Namespace: "*", - PeerName: "local", }, }, "partitioned type with empty partition": { @@ -201,14 +187,12 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "", Namespace: "", - PeerName: "local", }, }, "partitioned type with wildcard partition": { typ: demo.TypeV1RecordLabel, tenancy: &pbresource.Tenancy{ Partition: "*", - PeerName: "local", }, }, "partitioned type with wildcard partition and namespace": { @@ -216,7 +200,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "*", Namespace: "*", - PeerName: "local", }, }, "cluster type with empty partition and namespace": { @@ -224,7 +207,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "", Namespace: "", - PeerName: "local", }, }, @@ -233,7 +215,6 @@ func wildcardTenancyCases() map[string]struct { tenancy: &pbresource.Tenancy{ Partition: "*", Namespace: "*", - PeerName: "local", }, }, } diff --git a/agent/grpc-external/services/resource/watch.go b/agent/grpc-external/services/resource/watch.go index 7cbd478a80..f1874e6edb 100644 --- a/agent/grpc-external/services/resource/watch.go +++ b/agent/grpc-external/services/resource/watch.go @@ -128,18 +128,14 @@ func wildcardTenancyFor(scope resource.Scope) *pbresource.Tenancy { switch scope { case resource.ScopeCluster: - defaultTenancy = &pbresource.Tenancy{ - PeerName: storage.Wildcard, - } + defaultTenancy = &pbresource.Tenancy{} case resource.ScopePartition: defaultTenancy = &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, } default: defaultTenancy = &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, } } diff --git a/agent/grpc-external/services/resource/write_mav_common_test.go b/agent/grpc-external/services/resource/write_mav_common_test.go index 38406e12e5..6b6a82b44e 100644 --- a/agent/grpc-external/services/resource/write_mav_common_test.go +++ b/agent/grpc-external/services/resource/write_mav_common_test.go @@ -221,13 +221,6 @@ func mavOrWriteSuccessTestCases(t *testing.T) map[string]mavOrWriteSuccessTestCa }, expectedTenancy: resource.DefaultNamespacedTenancy(), }, - "namespaced resource defaults peername to local when empty": { - modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource { - artist.Id.Tenancy.PeerName = "" - return artist - }, - expectedTenancy: resource.DefaultNamespacedTenancy(), - }, "partitioned resource provides nonempty partition": { modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource { return recordLabel @@ -248,13 +241,6 @@ func mavOrWriteSuccessTestCases(t *testing.T) map[string]mavOrWriteSuccessTestCa }, expectedTenancy: resource.DefaultPartitionedTenancy(), }, - "partitioned resource defaults peername to local when empty": { - modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource { - recordLabel.Id.Tenancy.PeerName = "" - return recordLabel - }, - expectedTenancy: resource.DefaultPartitionedTenancy(), - }, } } diff --git a/agent/grpc-external/services/resource/write_status.go b/agent/grpc-external/services/resource/write_status.go index 7009a7fd72..fc209cd912 100644 --- a/agent/grpc-external/services/resource/write_status.go +++ b/agent/grpc-external/services/resource/write_status.go @@ -173,8 +173,6 @@ func (s *Server) validateWriteStatusRequest(req *pbresource.WriteStatusRequest) req.Id.Tenancy = &pbresource.Tenancy{ Partition: "", Namespace: "", - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - PeerName: "local", } } diff --git a/agent/xds/proxystateconverter/clusters.go b/agent/xds/proxystateconverter/clusters.go index febe29cf31..1e04007e07 100644 --- a/agent/xds/proxystateconverter/clusters.go +++ b/agent/xds/proxystateconverter/clusters.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/consul/agent/xds/naming" "github.com/hashicorp/consul/agent/xds/response" "github.com/hashicorp/consul/envoyextensions/xdscommon" + "github.com/hashicorp/consul/internal/resource" "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate" "github.com/hashicorp/consul/proto/private/pbpeering" ) @@ -726,7 +727,7 @@ func (s *Converter) createOutboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot, spi } // Add all trust bundle peer names, including local. - trustBundlePeerNames := []string{"local"} + trustBundlePeerNames := []string{resource.DefaultPeerName} for _, tb := range cfgSnap.PeeringTrustBundles() { trustBundlePeerNames = append(trustBundlePeerNames, tb.PeerName) } diff --git a/agent/xds/proxystateconverter/converter.go b/agent/xds/proxystateconverter/converter.go index 4c31127400..0116866c80 100644 --- a/agent/xds/proxystateconverter/converter.go +++ b/agent/xds/proxystateconverter/converter.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/configfetcher" proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker" + "github.com/hashicorp/consul/internal/resource" pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1" "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate" ) @@ -78,8 +79,6 @@ func (g *Converter) resourcesFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) erro return nil } -const localPeerKey = "local" - func (g *Converter) tlsConfigFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error { proxyStateTLS := &pbproxystate.TLS{} g.proxyState.TrustBundles = make(map[string]*pbproxystate.TrustBundle) @@ -89,7 +88,7 @@ func (g *Converter) tlsConfigFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) erro g.proxyState.Tls = proxyStateTLS // Add local trust bundle - g.proxyState.TrustBundles[localPeerKey] = &pbproxystate.TrustBundle{ + g.proxyState.TrustBundles[resource.DefaultPeerName] = &pbproxystate.TrustBundle{ TrustDomain: cfgSnap.Roots.TrustDomain, Roots: []string{cfgSnap.RootPEMs()}, } diff --git a/agent/xds/proxystateconverter/listeners.go b/agent/xds/proxystateconverter/listeners.go index 1e15ecb97c..11e966223b 100644 --- a/agent/xds/proxystateconverter/listeners.go +++ b/agent/xds/proxystateconverter/listeners.go @@ -27,6 +27,7 @@ import ( "github.com/hashicorp/consul/agent/xds/naming" "github.com/hashicorp/consul/agent/xds/platform" "github.com/hashicorp/consul/envoyextensions/xdscommon" + "github.com/hashicorp/consul/internal/resource" "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate" "github.com/hashicorp/consul/sdk/iptables" "github.com/hashicorp/consul/types" @@ -838,7 +839,7 @@ func (s *Converter) createInboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot) (*pb } // Add all trust bundle peer names, including local. - trustBundlePeerNames := []string{"local"} + trustBundlePeerNames := []string{resource.DefaultPeerName} for _, tb := range cfgSnap.PeeringTrustBundles() { trustBundlePeerNames = append(trustBundlePeerNames, tb.PeerName) } diff --git a/agent/xdsv2/testdata/clusters/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/clusters/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden index 7be1e84a29..41b31c237e 100644 --- a/agent/xdsv2/testdata/clusters/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden @@ -1,116 +1,116 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "original-destination", - "type": "ORIGINAL_DST", - "connectTimeout": "5s", - "lbPolicy": "CLUSTER_PROVIDED" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "original-destination", + "type": "ORIGINAL_DST", + "connectTimeout": "5s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/l4-multi-destination-default-default.golden b/agent/xdsv2/testdata/clusters/destination/l4-multi-destination-default-default.golden index 75ef164488..3bd178f9f4 100644 --- a/agent/xdsv2/testdata/clusters/destination/l4-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/l4-multi-destination-default-default.golden @@ -1,217 +1,217 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "null_route_cluster", - "type": "STATIC", - "connectTimeout": "10s" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "null_route_cluster", + "type": "STATIC", + "connectTimeout": "10s" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp2.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp2.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp2" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp2.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp2.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp2" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/clusters/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden index 7be1e84a29..41b31c237e 100644 --- a/agent/xdsv2/testdata/clusters/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,116 +1,116 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "original-destination", - "type": "ORIGINAL_DST", - "connectTimeout": "5s", - "lbPolicy": "CLUSTER_PROVIDED" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "original-destination", + "type": "ORIGINAL_DST", + "connectTimeout": "5s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/l4-single-destination-ip-port-bind-address-default-default.golden b/agent/xdsv2/testdata/clusters/destination/l4-single-destination-ip-port-bind-address-default-default.golden index cdaab85ea8..1ff2c7c249 100644 --- a/agent/xdsv2/testdata/clusters/destination/l4-single-destination-ip-port-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/l4-single-destination-ip-port-bind-address-default-default.golden @@ -1,115 +1,115 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "null_route_cluster", - "type": "STATIC", - "connectTimeout": "10s" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "null_route_cluster", + "type": "STATIC", + "connectTimeout": "10s" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/l4-single-destination-unix-socket-bind-address-default-default.golden b/agent/xdsv2/testdata/clusters/destination/l4-single-destination-unix-socket-bind-address-default-default.golden index 30ceddd6e2..70fdb0b265 100644 --- a/agent/xdsv2/testdata/clusters/destination/l4-single-destination-unix-socket-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/l4-single-destination-unix-socket-bind-address-default-default.golden @@ -1,58 +1,58 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/l4-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/clusters/destination/l4-single-implicit-destination-tproxy-default-default.golden index 91f05e0ac2..a24bcbeec5 100644 --- a/agent/xdsv2/testdata/clusters/destination/l4-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/l4-single-implicit-destination-tproxy-default-default.golden @@ -1,65 +1,65 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "original-destination", - "type": "ORIGINAL_DST", - "connectTimeout": "5s", - "lbPolicy": "CLUSTER_PROVIDED" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "original-destination", + "type": "ORIGINAL_DST", + "connectTimeout": "5s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination-default-default.golden b/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination-default-default.golden index 988a694d3c..b6acbbba1e 100644 --- a/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination-default-default.golden @@ -1,285 +1,285 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "55s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "55s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "failover-target~1~http.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "failover-target~1~http.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/backup1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/backup1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "backup-1.default.dc1.internal.foo.consul" + "sni": "backup-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "http.api-1.default.dc1.internal.foo.consul", - "altStatName": "http.api-1.default.dc1.internal.foo.consul", - "clusterType": { - "name": "envoy.clusters.aggregate", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig", - "clusters": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "http.api-1.default.dc1.internal.foo.consul", + "altStatName": "http.api-1.default.dc1.internal.foo.consul", + "clusterType": { + "name": "envoy.clusters.aggregate", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig", + "clusters": [ "failover-target~0~http.api-1.default.dc1.internal.foo.consul", "failover-target~1~http.api-1.default.dc1.internal.foo.consul" ] } }, - "connectTimeout": "55s", - "lbPolicy": "CLUSTER_PROVIDED" + "connectTimeout": "55s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "http.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "http.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "null_route_cluster", - "type": "STATIC", - "connectTimeout": "10s" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "null_route_cluster", + "type": "STATIC", + "connectTimeout": "10s" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-1.default.dc1.internal.foo.consul" + "sni": "api-1.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-2.default.dc1.internal.foo.consul" + "sni": "api-2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index 931eba209f..6f89514ef1 100644 --- a/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,320 +1,320 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "http.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "http.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "http.api-app2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "http.api-app2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "api-app2.default.dc1.internal.foo.consul" + "sni": "api-app2.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "original-destination", - "type": "ORIGINAL_DST", - "connectTimeout": "5s", - "lbPolicy": "CLUSTER_PROVIDED" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "original-destination", + "type": "ORIGINAL_DST", + "connectTimeout": "5s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-app2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-app2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-app2.default.dc1.internal.foo.consul" + "sni": "api-app2.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp2.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp2.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp2" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp2.api-app2.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp2.api-app2.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp2" ] }, - "sni": "api-app2.default.dc1.internal.foo.consul" + "sni": "api-app2.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index 08a65e9bb9..b636a46944 100644 --- a/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -1,167 +1,167 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "http.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "http.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "original-destination", - "type": "ORIGINAL_DST", - "connectTimeout": "5s", - "lbPolicy": "CLUSTER_PROVIDED" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "original-destination", + "type": "ORIGINAL_DST", + "connectTimeout": "5s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp2.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp2.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp2" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index 08a65e9bb9..b636a46944 100644 --- a/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/clusters/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -1,167 +1,167 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "http.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "http.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~http" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "original-destination", - "type": "ORIGINAL_DST", - "connectTimeout": "5s", - "lbPolicy": "CLUSTER_PROVIDED" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "original-destination", + "type": "ORIGINAL_DST", + "connectTimeout": "5s", + "lbPolicy": "CLUSTER_PROVIDED" }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "tcp2.api-app.default.dc1.internal.foo.consul", - "type": "EDS", - "edsClusterConfig": { - "edsConfig": { - "ads": {}, - "resourceApiVersion": "V3" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "tcp2.api-app.default.dc1.internal.foo.consul", + "type": "EDS", + "edsClusterConfig": { + "edsConfig": { + "ads": {}, + "resourceApiVersion": "V3" } }, - "connectTimeout": "5s", - "commonLbConfig": { - "healthyPanicThreshold": {} + "connectTimeout": "5s", + "commonLbConfig": { + "healthyPanicThreshold": {} }, - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" }, - "matchTypedSubjectAltNames": [ + "matchTypedSubjectAltNames": [ { - "sanType": "URI", - "matcher": { - "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" + "sanType": "URI", + "matcher": { + "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity" } } ] }, - "alpnProtocols": [ + "alpnProtocols": [ "consul~tcp2" ] }, - "sni": "api-app.default.dc1.internal.foo.consul" + "sni": "api-app.default.dc1.internal.foo.consul" } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/l7-expose-paths-default-default.golden b/agent/xdsv2/testdata/clusters/source/l7-expose-paths-default-default.golden index a83751b4b5..90dd023a8c 100644 --- a/agent/xdsv2/testdata/clusters/source/l7-expose-paths-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/l7-expose-paths-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "exposed_cluster_9090", - "type": "STATIC", - "loadAssignment": { - "clusterName": "exposed_cluster_9090", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "exposed_cluster_9090", + "type": "STATIC", + "loadAssignment": { + "clusterName": "exposed_cluster_9090", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9090 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9090 } } } @@ -26,20 +26,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "exposed_cluster_9091", - "type": "STATIC", - "loadAssignment": { - "clusterName": "exposed_cluster_9091", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "exposed_cluster_9091", + "type": "STATIC", + "loadAssignment": { + "clusterName": "exposed_cluster_9091", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9091 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9091 } } } @@ -48,30 +48,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:port1", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:port1", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:port1", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:port1", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -82,6 +82,6 @@ } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/local-and-inbound-connections-default-default.golden b/agent/xdsv2/testdata/clusters/source/local-and-inbound-connections-default-default.golden index d4e6fd1d64..4b47440ff9 100644 --- a/agent/xdsv2/testdata/clusters/source/local-and-inbound-connections-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/local-and-inbound-connections-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "exposed_cluster_9090", - "type": "STATIC", - "loadAssignment": { - "clusterName": "exposed_cluster_9090", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "exposed_cluster_9090", + "type": "STATIC", + "loadAssignment": { + "clusterName": "exposed_cluster_9090", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9090 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9090 } } } @@ -26,20 +26,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "exposed_cluster_9091", - "type": "STATIC", - "loadAssignment": { - "clusterName": "exposed_cluster_9091", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "exposed_cluster_9091", + "type": "STATIC", + "loadAssignment": { + "clusterName": "exposed_cluster_9091", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9091 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9091 } } } @@ -48,31 +48,31 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:port1", - "type": "STATIC", - "connectTimeout": "6s", - "loadAssignment": { - "clusterName": "local_app:port1", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:port1", + "type": "STATIC", + "connectTimeout": "6s", + "loadAssignment": { + "clusterName": "local_app:port1", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -81,30 +81,30 @@ } ] }, - "circuitBreakers": { - "thresholds": [ + "circuitBreakers": { + "thresholds": [ { - "maxConnections": 123 + "maxConnections": 123 } ] } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:port3", - "type": "STATIC", - "connectTimeout": "8s", - "loadAssignment": { - "clusterName": "local_app:port3", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:port3", + "type": "STATIC", + "connectTimeout": "8s", + "loadAssignment": { + "clusterName": "local_app:port3", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8081 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8081 } } } @@ -113,15 +113,15 @@ } ] }, - "circuitBreakers": { - "thresholds": [ + "circuitBreakers": { + "thresholds": [ { - "maxConnections": 123 + "maxConnections": 123 } ] } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports-default-default.golden index 0d7d009aa1..a79aca1320 100644 --- a/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:grpc", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:grpc", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:grpc", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:grpc", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8083 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8083 } } } @@ -24,30 +24,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:http", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:http", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:http", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:http", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8081 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8081 } } } @@ -58,20 +58,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:http2", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:http2", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:http2", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:http2", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8082 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8082 } } } @@ -80,30 +80,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:tcp", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:tcp", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:tcp", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:tcp", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -114,6 +114,6 @@ } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports-default-default.golden index 0d7d009aa1..a79aca1320 100644 --- a/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:grpc", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:grpc", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:grpc", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:grpc", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8083 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8083 } } } @@ -24,30 +24,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:http", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:http", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:http", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:http", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8081 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8081 } } } @@ -58,20 +58,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:http2", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:http2", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:http2", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:http2", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8082 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8082 } } } @@ -80,30 +80,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:tcp", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:tcp", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:tcp", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:tcp", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -114,6 +114,6 @@ } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden index 045470a3e5..bd261f853a 100644 --- a/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:admin-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:admin-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:admin-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:admin-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -26,20 +26,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:api-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:api-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:api-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:api-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9090 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9090 } } } @@ -50,6 +50,6 @@ } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden index 045470a3e5..bd261f853a 100644 --- a/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:admin-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:admin-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:admin-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:admin-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -26,20 +26,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:api-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:api-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:api-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:api-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9090 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9090 } } } @@ -50,6 +50,6 @@ } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiport-l4-workload-with-only-mesh-port-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiport-l4-workload-with-only-mesh-port-default-default.golden index 460d515fe5..6aea19496c 100644 --- a/agent/xdsv2/testdata/clusters/source/multiport-l4-workload-with-only-mesh-port-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiport-l4-workload-with-only-mesh-port-default-default.golden @@ -1,12 +1,12 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "black-hole-cluster", - "type": "STATIC" + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "black-hole-cluster", + "type": "STATIC" } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden index 339faaae6b..00b3968e7b 100644 --- a/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:admin-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:admin-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:admin-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:admin-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -26,20 +26,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:api-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:api-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:api-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:api-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9090 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9090 } } } @@ -48,16 +48,16 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden index 6246f19733..01ae220208 100644 --- a/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:admin-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:admin-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:admin-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:admin-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -26,20 +26,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:api-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:api-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:api-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:api-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9090 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9090 } } } @@ -48,30 +48,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:grpc-port", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:grpc-port", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:grpc-port", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:grpc-port", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 9091 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 9091 } } } @@ -80,16 +80,16 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/clusters/source/single-workload-address-without-ports-default-default.golden b/agent/xdsv2/testdata/clusters/source/single-workload-address-without-ports-default-default.golden index 0d7d009aa1..a79aca1320 100644 --- a/agent/xdsv2/testdata/clusters/source/single-workload-address-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/clusters/source/single-workload-address-without-ports-default-default.golden @@ -1,21 +1,21 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:grpc", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:grpc", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:grpc", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:grpc", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8083 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8083 } } } @@ -24,30 +24,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:http", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:http", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:http", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:http", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8081 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8081 } } } @@ -58,20 +58,20 @@ } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:http2", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:http2", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:http2", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:http2", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8082 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8082 } } } @@ -80,30 +80,30 @@ } ] }, - "typedExtensionProtocolOptions": { - "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { - "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", - "explicitHttpConfig": { - "http2ProtocolOptions": {} + "typedExtensionProtocolOptions": { + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { + "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", + "explicitHttpConfig": { + "http2ProtocolOptions": {} } } } }, { - "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "name": "local_app:tcp", - "type": "STATIC", - "loadAssignment": { - "clusterName": "local_app:tcp", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "name": "local_app:tcp", + "type": "STATIC", + "loadAssignment": { + "clusterName": "local_app:tcp", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 8080 + "endpoint": { + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 8080 } } } @@ -114,6 +114,6 @@ } } ], - "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden index f7d569dc22..d9bf316a98 100644 --- a/agent/xdsv2/testdata/endpoints/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden @@ -1,49 +1,49 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/l4-multi-destination-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/l4-multi-destination-default-default.golden index f8bca7ea32..8c421ec8e7 100644 --- a/agent/xdsv2/testdata/endpoints/destination/l4-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/l4-multi-destination-default-default.golden @@ -1,91 +1,91 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp2.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp2.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp2.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp2.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden index f7d569dc22..d9bf316a98 100644 --- a/agent/xdsv2/testdata/endpoints/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,49 +1,49 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-ip-port-bind-address-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-ip-port-bind-address-default-default.golden index f7d569dc22..d9bf316a98 100644 --- a/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-ip-port-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-ip-port-bind-address-default-default.golden @@ -1,49 +1,49 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-unix-socket-bind-address-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-unix-socket-bind-address-default-default.golden index 8075b842d9..d1f270c6fa 100644 --- a/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-unix-socket-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/l4-single-destination-unix-socket-bind-address-default-default.golden @@ -1,28 +1,28 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/l4-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/l4-single-implicit-destination-tproxy-default-default.golden index 333765ea0c..52dd8de17c 100644 --- a/agent/xdsv2/testdata/endpoints/destination/l4-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/l4-single-implicit-destination-tproxy-default-default.golden @@ -1,28 +1,28 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/mixed-multi-destination-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/mixed-multi-destination-default-default.golden index e22812cafe..876727e13f 100644 --- a/agent/xdsv2/testdata/endpoints/destination/mixed-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/mixed-multi-destination-default-default.golden @@ -1,91 +1,91 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "http.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "http.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "http.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "http.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-1.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index 56ff9fb588..b3e79b2f54 100644 --- a/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,133 +1,133 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "http.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "http.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "http.api-app2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "http.api-app2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-app2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-app2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp2.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp2.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp2.api-app2.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp2.api-app2.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index 52f227f9d4..5033fe6236 100644 --- a/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -1,70 +1,70 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "http.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "http.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp2.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp2.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index 52f227f9d4..5033fe6236 100644 --- a/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -1,70 +1,70 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "http.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "http.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] }, { - "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "tcp2.api-app.default.dc1.internal.foo.consul", - "endpoints": [ + "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "clusterName": "tcp2.api-app.default.dc1.internal.foo.consul", + "endpoints": [ { - "lbEndpoints": [ + "lbEndpoints": [ { - "endpoint": { - "address": { - "socketAddress": { - "address": "10.1.1.1", - "portValue": 20000 + "endpoint": { + "address": { + "socketAddress": { + "address": "10.1.1.1", + "portValue": 20000 } } }, - "healthStatus": "HEALTHY" + "healthStatus": "HEALTHY" } ] } ] } ], - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/l7-expose-paths-default-default.golden b/agent/xdsv2/testdata/endpoints/source/l7-expose-paths-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/l7-expose-paths-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/l7-expose-paths-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections-default-default.golden b/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l4-workload-with-only-mesh-port-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l4-workload-with-only-mesh-port-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiport-l4-workload-with-only-mesh-port-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiport-l4-workload-with-only-mesh-port-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports-default-default.golden b/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports-default-default.golden index 47b46bca22..8504dae2b8 100644 --- a/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/listeners/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden index 35304ea0d7..558e59c257 100644 --- a/agent/xdsv2/testdata/listeners/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden @@ -1,90 +1,90 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", - "address": { - "socketAddress": { - "address": "1.1.1.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-1:tcp:1.1.1.1:1234", + "address": { + "socketAddress": { + "address": "1.1.1.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-1.default.default.dc1", - "cluster": "tcp.api-1.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-1.default.default.dc1", + "cluster": "tcp.api-1.default.dc1.internal.foo.consul" } } ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "outbound_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 15001 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "outbound_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 15001 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "2.2.2.2", - "prefixLen": 32 + "addressPrefix": "2.2.2.2", + "prefixLen": 32 }, { - "addressPrefix": "3.3.3.3", - "prefixLen": 32 + "addressPrefix": "3.3.3.3", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-2.default.default.dc1", - "cluster": "tcp.api-2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-2.default.default.dc1", + "cluster": "tcp.api-2.default.dc1.internal.foo.consul" } } ] } ], - "defaultFilterChain": { - "filters": [ + "defaultFilterChain": { + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.original-destination", - "cluster": "original-destination" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.original-destination", + "cluster": "original-destination" } } ] }, - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.original_dst", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" + "name": "envoy.filters.listener.original_dst", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" } } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/l4-multi-destination-default-default.golden b/agent/xdsv2/testdata/listeners/destination/l4-multi-destination-default-default.golden index 105b508ef5..16040c696a 100644 --- a/agent/xdsv2/testdata/listeners/destination/l4-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/l4-multi-destination-default-default.golden @@ -1,36 +1,36 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-1:tcp2:1.1.1.1:2345", - "address": { - "socketAddress": { - "address": "1.1.1.1", - "portValue": 2345 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-1:tcp2:1.1.1.1:2345", + "address": { + "socketAddress": { + "address": "1.1.1.1", + "portValue": 2345 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp2.api-1.default.default.dc1", - "weightedClusters": { - "clusters": [ + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp2.api-1.default.default.dc1", + "weightedClusters": { + "clusters": [ { - "name": "tcp2.api-2.default.dc1.internal.foo.consul", - "weight": 60 + "name": "tcp2.api-2.default.dc1.internal.foo.consul", + "weight": 60 }, { - "name": "tcp2.api-1.default.dc1.internal.foo.consul", - "weight": 40 + "name": "tcp2.api-1.default.dc1.internal.foo.consul", + "weight": 40 }, { - "name": "null_route_cluster", - "weight": 10 + "name": "null_route_cluster", + "weight": 10 } ] } @@ -39,38 +39,38 @@ ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", - "address": { - "socketAddress": { - "address": "1.1.1.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-1:tcp:1.1.1.1:1234", + "address": { + "socketAddress": { + "address": "1.1.1.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-1.default.default.dc1", - "weightedClusters": { - "clusters": [ + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-1.default.default.dc1", + "weightedClusters": { + "clusters": [ { - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "weight": 60 + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "weight": 60 }, { - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "weight": 40 + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "weight": 40 }, { - "name": "null_route_cluster", - "weight": 10 + "name": "null_route_cluster", + "weight": 10 } ] } @@ -79,59 +79,59 @@ ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-2:tcp2:/path/to/socket", - "address": { - "pipe": { - "path": "/path/to/socket", - "mode": 438 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-2:tcp2:/path/to/socket", + "address": { + "pipe": { + "path": "/path/to/socket", + "mode": 438 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp2.api-2.default.default.dc1", - "cluster": "tcp2.api-2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp2.api-2.default.default.dc1", + "cluster": "tcp2.api-2.default.dc1.internal.foo.consul" } } ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-2:tcp:/path/to/socket", - "address": { - "pipe": { - "path": "/path/to/socket", - "mode": 438 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-2:tcp:/path/to/socket", + "address": { + "pipe": { + "path": "/path/to/socket", + "mode": 438 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-2.default.default.dc1", - "cluster": "tcp.api-2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-2.default.default.dc1", + "cluster": "tcp.api-2.default.dc1.internal.foo.consul" } } ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/listeners/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden index 7901233ae9..b9ac14b2ea 100644 --- a/agent/xdsv2/testdata/listeners/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,86 +1,86 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "outbound_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 15001 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "outbound_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 15001 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-1.default.default.dc1", - "cluster": "tcp.api-1.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-1.default.default.dc1", + "cluster": "tcp.api-1.default.dc1.internal.foo.consul" } } ] }, { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "2.2.2.2", - "prefixLen": 32 + "addressPrefix": "2.2.2.2", + "prefixLen": 32 }, { - "addressPrefix": "3.3.3.3", - "prefixLen": 32 + "addressPrefix": "3.3.3.3", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-2.default.default.dc1", - "cluster": "tcp.api-2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-2.default.default.dc1", + "cluster": "tcp.api-2.default.dc1.internal.foo.consul" } } ] } ], - "defaultFilterChain": { - "filters": [ + "defaultFilterChain": { + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.original-destination", - "cluster": "original-destination" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.original-destination", + "cluster": "original-destination" } } ] }, - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.original_dst", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" + "name": "envoy.filters.listener.original_dst", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" } } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/l4-single-destination-ip-port-bind-address-default-default.golden b/agent/xdsv2/testdata/listeners/destination/l4-single-destination-ip-port-bind-address-default-default.golden index 5f78003e3f..d042d5d556 100644 --- a/agent/xdsv2/testdata/listeners/destination/l4-single-destination-ip-port-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/l4-single-destination-ip-port-bind-address-default-default.golden @@ -1,36 +1,36 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", - "address": { - "socketAddress": { - "address": "1.1.1.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-1:tcp:1.1.1.1:1234", + "address": { + "socketAddress": { + "address": "1.1.1.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-1.default.default.dc1", - "weightedClusters": { - "clusters": [ + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-1.default.default.dc1", + "weightedClusters": { + "clusters": [ { - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "weight": 60 + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "weight": 60 }, { - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "weight": 40 + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "weight": 40 }, { - "name": "null_route_cluster", - "weight": 10 + "name": "null_route_cluster", + "weight": 10 } ] } @@ -39,9 +39,9 @@ ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/l4-single-destination-unix-socket-bind-address-default-default.golden b/agent/xdsv2/testdata/listeners/destination/l4-single-destination-unix-socket-bind-address-default-default.golden index cf468d7fbb..ca662a5592 100644 --- a/agent/xdsv2/testdata/listeners/destination/l4-single-destination-unix-socket-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/l4-single-destination-unix-socket-bind-address-default-default.golden @@ -1,32 +1,32 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-2:tcp:/path/to/socket", - "address": { - "pipe": { - "path": "/path/to/socket", - "mode": 438 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-2:tcp:/path/to/socket", + "address": { + "pipe": { + "path": "/path/to/socket", + "mode": 438 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-2.default.default.dc1", - "cluster": "tcp.api-2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-2.default.default.dc1", + "cluster": "tcp.api-2.default.dc1.internal.foo.consul" } } ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/l4-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/listeners/destination/l4-single-implicit-destination-tproxy-default-default.golden index ce759b6b02..dd56d7fbfc 100644 --- a/agent/xdsv2/testdata/listeners/destination/l4-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/l4-single-implicit-destination-tproxy-default-default.golden @@ -1,61 +1,61 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "outbound_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 15001 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "outbound_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 15001 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-1.default.default.dc1", - "cluster": "tcp.api-1.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-1.default.default.dc1", + "cluster": "tcp.api-1.default.dc1.internal.foo.consul" } } ] } ], - "defaultFilterChain": { - "filters": [ + "defaultFilterChain": { + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.original-destination", - "cluster": "original-destination" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.original-destination", + "cluster": "original-destination" } } ] }, - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.original_dst", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" + "name": "envoy.filters.listener.original_dst", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" } } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination-default-default.golden b/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination-default-default.golden index eae168bf8a..fa6f5bf80e 100644 --- a/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination-default-default.golden @@ -1,44 +1,44 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-1:http:1.1.1.1:1234", - "address": { - "socketAddress": { - "address": "1.1.1.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-1:http:1.1.1.1:1234", + "address": { + "socketAddress": { + "address": "1.1.1.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.http.api-1.default.default.dc1", - "rds": { - "configSource": { - "ads": {}, - "resourceApiVersion": "V3" + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "upstream.http.api-1.default.default.dc1", + "rds": { + "configSource": { + "ads": {}, + "resourceApiVersion": "V3" }, - "routeConfigName": "default/local/default/api-1:http:1.1.1.1:1234" + "routeConfigName": "default/default/api-1:http:1.1.1.1:1234" }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -46,38 +46,38 @@ ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", - "address": { - "socketAddress": { - "address": "1.1.1.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-1:tcp:1.1.1.1:1234", + "address": { + "socketAddress": { + "address": "1.1.1.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-1.default.default.dc1", - "weightedClusters": { - "clusters": [ + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-1.default.default.dc1", + "weightedClusters": { + "clusters": [ { - "name": "tcp.api-2.default.dc1.internal.foo.consul", - "weight": 60 + "name": "tcp.api-2.default.dc1.internal.foo.consul", + "weight": 60 }, { - "name": "tcp.api-1.default.dc1.internal.foo.consul", - "weight": 40 + "name": "tcp.api-1.default.dc1.internal.foo.consul", + "weight": 40 }, { - "name": "null_route_cluster", - "weight": 10 + "name": "null_route_cluster", + "weight": 10 } ] } @@ -86,34 +86,34 @@ ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "default/local/default/api-2:tcp:/path/to/socket", - "address": { - "pipe": { - "path": "/path/to/socket", - "mode": 438 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "default/default/api-2:tcp:/path/to/socket", + "address": { + "pipe": { + "path": "/path/to/socket", + "mode": 438 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-2.default.default.dc1", - "cluster": "tcp.api-2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-2.default.default.dc1", + "cluster": "tcp.api-2.default.dc1.internal.foo.consul" } } ] } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index b0477d8310..254e0ec47d 100644 --- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,74 +1,74 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "outbound_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 15001 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "outbound_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 15001 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-app.default.default.dc1", - "cluster": "tcp.api-app.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-app.default.default.dc1", + "cluster": "tcp.api-app.default.dc1.internal.foo.consul" } } ] }, { - "filterChainMatch": { - "destinationPort": 8080, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8080, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.http.api-app.default.default.dc1", - "rds": { - "configSource": { - "ads": {}, - "resourceApiVersion": "V3" + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "upstream.http.api-app.default.default.dc1", + "rds": { + "configSource": { + "ads": {}, + "resourceApiVersion": "V3" }, - "routeConfigName": "default/local/default/api-app:http" + "routeConfigName": "default/default/api-app:http" }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -76,92 +76,92 @@ ] }, { - "filterChainMatch": { - "destinationPort": 8081, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8081, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp2.api-app.default.default.dc1", - "cluster": "tcp2.api-app.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp2.api-app.default.default.dc1", + "cluster": "tcp2.api-app.default.dc1.internal.foo.consul" } } ] }, { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "2.2.2.2", - "prefixLen": 32 + "addressPrefix": "2.2.2.2", + "prefixLen": 32 }, { - "addressPrefix": "3.3.3.3", - "prefixLen": 32 + "addressPrefix": "3.3.3.3", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-app2.default.default.dc1", - "cluster": "tcp.api-app2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-app2.default.default.dc1", + "cluster": "tcp.api-app2.default.dc1.internal.foo.consul" } } ] }, { - "filterChainMatch": { - "destinationPort": 8080, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8080, + "prefixRanges": [ { - "addressPrefix": "2.2.2.2", - "prefixLen": 32 + "addressPrefix": "2.2.2.2", + "prefixLen": 32 }, { - "addressPrefix": "3.3.3.3", - "prefixLen": 32 + "addressPrefix": "3.3.3.3", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.http.api-app2.default.default.dc1", - "rds": { - "configSource": { - "ads": {}, - "resourceApiVersion": "V3" + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "upstream.http.api-app2.default.default.dc1", + "rds": { + "configSource": { + "ads": {}, + "resourceApiVersion": "V3" }, - "routeConfigName": "default/local/default/api-app2:http" + "routeConfigName": "default/default/api-app2:http" }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -169,54 +169,54 @@ ] }, { - "filterChainMatch": { - "destinationPort": 8081, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8081, + "prefixRanges": [ { - "addressPrefix": "2.2.2.2", - "prefixLen": 32 + "addressPrefix": "2.2.2.2", + "prefixLen": 32 }, { - "addressPrefix": "3.3.3.3", - "prefixLen": 32 + "addressPrefix": "3.3.3.3", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp2.api-app2.default.default.dc1", - "cluster": "tcp2.api-app2.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp2.api-app2.default.default.dc1", + "cluster": "tcp2.api-app2.default.dc1.internal.foo.consul" } } ] } ], - "defaultFilterChain": { - "filters": [ + "defaultFilterChain": { + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.original-destination", - "cluster": "original-destination" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.original-destination", + "cluster": "original-destination" } } ] }, - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.original_dst", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" + "name": "envoy.filters.listener.original_dst", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" } } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index 180213b652..28dc69d170 100644 --- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -1,74 +1,74 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "outbound_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 15001 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "outbound_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 15001 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-app.default.default.dc1", - "cluster": "tcp.api-app.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-app.default.default.dc1", + "cluster": "tcp.api-app.default.dc1.internal.foo.consul" } } ] }, { - "filterChainMatch": { - "destinationPort": 8080, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8080, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.http.api-app.default.default.dc1", - "rds": { - "configSource": { - "ads": {}, - "resourceApiVersion": "V3" + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "upstream.http.api-app.default.default.dc1", + "rds": { + "configSource": { + "ads": {}, + "resourceApiVersion": "V3" }, - "routeConfigName": "default/local/default/api-app:http" + "routeConfigName": "default/default/api-app:http" }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -76,50 +76,50 @@ ] }, { - "filterChainMatch": { - "destinationPort": 8081, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8081, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp2.api-app.default.default.dc1", - "cluster": "tcp2.api-app.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp2.api-app.default.default.dc1", + "cluster": "tcp2.api-app.default.dc1.internal.foo.consul" } } ] } ], - "defaultFilterChain": { - "filters": [ + "defaultFilterChain": { + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.original-destination", - "cluster": "original-destination" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.original-destination", + "cluster": "original-destination" } } ] }, - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.original_dst", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" + "name": "envoy.filters.listener.original_dst", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" } } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index 180213b652..28dc69d170 100644 --- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -1,74 +1,74 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "outbound_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 15001 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "outbound_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 15001 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "destinationPort": 7070, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 7070, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp.api-app.default.default.dc1", - "cluster": "tcp.api-app.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp.api-app.default.default.dc1", + "cluster": "tcp.api-app.default.dc1.internal.foo.consul" } } ] }, { - "filterChainMatch": { - "destinationPort": 8080, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8080, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.http.api-app.default.default.dc1", - "rds": { - "configSource": { - "ads": {}, - "resourceApiVersion": "V3" + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "upstream.http.api-app.default.default.dc1", + "rds": { + "configSource": { + "ads": {}, + "resourceApiVersion": "V3" }, - "routeConfigName": "default/local/default/api-app:http" + "routeConfigName": "default/default/api-app:http" }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -76,50 +76,50 @@ ] }, { - "filterChainMatch": { - "destinationPort": 8081, - "prefixRanges": [ + "filterChainMatch": { + "destinationPort": 8081, + "prefixRanges": [ { - "addressPrefix": "1.1.1.1", - "prefixLen": 32 + "addressPrefix": "1.1.1.1", + "prefixLen": 32 } ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.tcp2.api-app.default.default.dc1", - "cluster": "tcp2.api-app.default.dc1.internal.foo.consul" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.tcp2.api-app.default.default.dc1", + "cluster": "tcp2.api-app.default.dc1.internal.foo.consul" } } ] } ], - "defaultFilterChain": { - "filters": [ + "defaultFilterChain": { + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.original-destination", - "cluster": "original-destination" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "upstream.original-destination", + "cluster": "original-destination" } } ] }, - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.original_dst", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" + "name": "envoy.filters.listener.original_dst", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst" } } ], - "trafficDirection": "OUTBOUND" + "trafficDirection": "OUTBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/l7-expose-paths-default-default.golden b/agent/xdsv2/testdata/listeners/source/l7-expose-paths-default-default.golden index 973c825a6c..fed539c583 100644 --- a/agent/xdsv2/testdata/listeners/source/l7-expose-paths-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/l7-expose-paths-default-default.golden @@ -1,59 +1,59 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "exposed_path_GetHealth1235", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 1235 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "exposed_path_GetHealth1235", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 1235 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "exposed_path_route_GetHealth1235", - "routeConfig": { - "name": "exposed_path_route_GetHealth1235", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "exposed_path_route_GetHealth1235", + "routeConfig": { + "name": "exposed_path_route_GetHealth1235", + "virtualHosts": [ { - "name": "exposed_path_route_GetHealth1235", - "domains": [ + "name": "exposed_path_route_GetHealth1235", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "path": "GetHealth" + "match": { + "path": "GetHealth" }, - "route": { - "cluster": "exposed_cluster_9091" + "route": { + "cluster": "exposed_cluster_9091" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -61,60 +61,60 @@ ] } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "exposed_path_health1234", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "exposed_path_health1234", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "exposed_path_route_health1234", - "routeConfig": { - "name": "exposed_path_route_health1234", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "exposed_path_route_health1234", + "routeConfig": { + "name": "exposed_path_route_health1234", + "virtualHosts": [ { - "name": "exposed_path_route_health1234", - "domains": [ + "name": "exposed_path_route_health1234", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "path": "/health" + "match": { + "path": "/health" }, - "route": { - "cluster": "exposed_cluster_9090" + "route": { + "cluster": "exposed_cluster_9090" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -122,80 +122,80 @@ ] } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~port1" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:port1" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:port1" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/local-and-inbound-connections-default-default.golden b/agent/xdsv2/testdata/listeners/source/local-and-inbound-connections-default-default.golden index 916961daaf..0728f09b97 100644 --- a/agent/xdsv2/testdata/listeners/source/local-and-inbound-connections-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/local-and-inbound-connections-default-default.golden @@ -1,59 +1,59 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "exposed_path_GetHealth1235", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 1235 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "exposed_path_GetHealth1235", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 1235 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "exposed_path_route_GetHealth1235", - "routeConfig": { - "name": "exposed_path_route_GetHealth1235", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "exposed_path_route_GetHealth1235", + "routeConfig": { + "name": "exposed_path_route_GetHealth1235", + "virtualHosts": [ { - "name": "exposed_path_route_GetHealth1235", - "domains": [ + "name": "exposed_path_route_GetHealth1235", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "path": "GetHealth" + "match": { + "path": "GetHealth" }, - "route": { - "cluster": "exposed_cluster_9091" + "route": { + "cluster": "exposed_cluster_9091" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -61,60 +61,60 @@ ] } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "exposed_path_health1234", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 1234 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "exposed_path_health1234", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 1234 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "exposed_path_route_health1234", - "routeConfig": { - "name": "exposed_path_route_health1234", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "exposed_path_route_health1234", + "routeConfig": { + "name": "exposed_path_route_health1234", + "virtualHosts": [ { - "name": "exposed_path_route_health1234", - "domains": [ + "name": "exposed_path_route_health1234", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "path": "/health" + "match": { + "path": "/health" }, - "route": { - "cluster": "exposed_cluster_9090" + "route": { + "cluster": "exposed_cluster_9090" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } @@ -122,188 +122,188 @@ ] } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" }, { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~port1" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.connection_limit", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit", - "statPrefix": "inbound_connection_limit", - "maxConnections": "123" + "name": "envoy.filters.network.connection_limit", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit", + "statPrefix": "inbound_connection_limit", + "maxConnections": "123" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:port1" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:port1" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~port3" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.connection_limit", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit", - "statPrefix": "inbound_connection_limit", - "maxConnections": "123" + "name": "envoy.filters.network.connection_limit", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit", + "statPrefix": "inbound_connection_limit", + "maxConnections": "123" } }, { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:port3", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:port3", + "virtualHosts": [ { - "name": "public_listener:port3", - "domains": [ + "name": "public_listener:port3", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:port3", - "timeout": "9s" + "route": { + "cluster": "local_app:port3", + "timeout": "9s" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND", - "connectionBalanceConfig": { - "exactBalance": {} + "trafficDirection": "INBOUND", + "connectionBalanceConfig": { + "exactBalance": {} } } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports-default-default.golden index c27e01412a..f42b137a70 100644 --- a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,81 +1,81 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "127.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "127.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~grpc" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:grpc", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:grpc", + "virtualHosts": [ { - "name": "public_listener:grpc", - "domains": [ + "name": "public_listener:grpc", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:grpc" + "route": { + "cluster": "local_app:grpc" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.grpc_stats", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", - "statsForAllMethods": true + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true } }, { - "name": "envoy.filters.http.grpc_http1_bridge", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" + "name": "envoy.filters.http.grpc_http1_bridge", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" } }, { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": { - "policies": { - "consul-intentions-layer4": { - "permissions": [ + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": { + "policies": { + "consul-intentions-layer4": { + "permissions": [ { - "any": true + "any": true } ], - "principals": [ + "principals": [ { - "authenticated": { - "principalName": { - "safeRegex": { - "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" + "authenticated": { + "principalName": { + "safeRegex": { + "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" } } } @@ -87,106 +87,106 @@ } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~http" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:http", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:http", + "virtualHosts": [ { - "name": "public_listener:http", - "domains": [ + "name": "public_listener:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:http" + "route": { + "cluster": "local_app:http" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": { - "policies": { - "consul-intentions-layer4": { - "permissions": [ + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": { + "policies": { + "consul-intentions-layer4": { + "permissions": [ { - "any": true + "any": true } ], - "principals": [ + "principals": [ { - "authenticated": { - "principalName": { - "safeRegex": { - "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" + "authenticated": { + "principalName": { + "safeRegex": { + "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" } } } @@ -198,104 +198,104 @@ } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~http2" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:http2", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:http2", + "virtualHosts": [ { - "name": "public_listener:http2", - "domains": [ + "name": "public_listener:http2", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:http2" + "route": { + "cluster": "local_app:http2" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": { - "policies": { - "consul-intentions-layer4": { - "permissions": [ + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": { + "policies": { + "consul-intentions-layer4": { + "permissions": [ { - "any": true + "any": true } ], - "principals": [ + "principals": [ { - "authenticated": { - "principalName": { - "safeRegex": { - "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" + "authenticated": { + "principalName": { + "safeRegex": { + "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" } } } @@ -307,79 +307,79 @@ } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~tcp" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": { - "policies": { - "consul-intentions-layer4": { - "permissions": [ + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": { + "policies": { + "consul-intentions-layer4": { + "permissions": [ { - "any": true + "any": true } ], - "principals": [ + "principals": [ { - "authenticated": { - "principalName": { - "safeRegex": { - "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" + "authenticated": { + "principalName": { + "safeRegex": { + "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$" } } } @@ -388,56 +388,56 @@ } } }, - "statPrefix": "connect_authz" + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:tcp" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:tcp" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports-default-default.golden index 81f3bcca70..a7bc8ab0fa 100644 --- a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports-default-default.golden @@ -1,359 +1,359 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~grpc" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:grpc", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:grpc", + "virtualHosts": [ { - "name": "public_listener:grpc", - "domains": [ + "name": "public_listener:grpc", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:grpc" + "route": { + "cluster": "local_app:grpc" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.grpc_stats", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", - "statsForAllMethods": true + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true } }, { - "name": "envoy.filters.http.grpc_http1_bridge", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" + "name": "envoy.filters.http.grpc_http1_bridge", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" } }, { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~http" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:http", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:http", + "virtualHosts": [ { - "name": "public_listener:http", - "domains": [ + "name": "public_listener:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:http" + "route": { + "cluster": "local_app:http" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~http2" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:http2", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:http2", + "virtualHosts": [ { - "name": "public_listener:http2", - "domains": [ + "name": "public_listener:http2", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:http2" + "route": { + "cluster": "local_app:http2" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~tcp" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:tcp" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:tcp" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden index 10fcbb9c9b..917c5d0bb7 100644 --- a/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,128 +1,128 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.3", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.3", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~admin-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:admin-port" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:admin-port" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~api-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:api-port" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:api-port" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden index ba86701854..e4a55003b3 100644 --- a/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden @@ -1,128 +1,128 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~admin-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:admin-port" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:admin-port" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~api-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:api-port" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:api-port" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiport-l4-workload-with-only-mesh-port-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiport-l4-workload-with-only-mesh-port-default-default.golden index 15d019e69c..514443a486 100644 --- a/agent/xdsv2/testdata/listeners/source/multiport-l4-workload-with-only-mesh-port-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiport-l4-workload-with-only-mesh-port-default-default.golden @@ -1,40 +1,40 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filters": [ + "filters": [ { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "black-hole-cluster" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "black-hole-cluster" } } ] } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden index 1f0d971a99..ce865fa5bd 100644 --- a/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,206 +1,206 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.3", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.3", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~admin-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:admin-port", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:admin-port", + "virtualHosts": [ { - "name": "public_listener:admin-port", - "domains": [ + "name": "public_listener:admin-port", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:admin-port" + "route": { + "cluster": "local_app:admin-port" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~api-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:api-port", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:api-port", + "virtualHosts": [ { - "name": "public_listener:api-port", - "domains": [ + "name": "public_listener:api-port", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:api-port" + "route": { + "cluster": "local_app:api-port" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden index 594d47c96c..2c128f8a8c 100644 --- a/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden @@ -1,309 +1,309 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~admin-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:admin-port", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:admin-port", + "virtualHosts": [ { - "name": "public_listener:admin-port", - "domains": [ + "name": "public_listener:admin-port", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:admin-port" + "route": { + "cluster": "local_app:admin-port" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~api-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:api-port", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:api-port", + "virtualHosts": [ { - "name": "public_listener:api-port", - "domains": [ + "name": "public_listener:api-port", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:api-port" + "route": { + "cluster": "local_app:api-port" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~grpc-port" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:grpc-port", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:grpc-port", + "virtualHosts": [ { - "name": "public_listener:grpc-port", - "domains": [ + "name": "public_listener:grpc-port", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:grpc-port" + "route": { + "cluster": "local_app:grpc-port" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.grpc_stats", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", - "statsForAllMethods": true + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true } }, { - "name": "envoy.filters.http.grpc_http1_bridge", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" + "name": "envoy.filters.http.grpc_http1_bridge", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" } }, { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports-default-default.golden b/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports-default-default.golden index 81f3bcca70..a7bc8ab0fa 100644 --- a/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports-default-default.golden @@ -1,359 +1,359 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "public_listener", - "address": { - "socketAddress": { - "address": "10.0.0.1", - "portValue": 20000 + "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", + "name": "public_listener", + "address": { + "socketAddress": { + "address": "10.0.0.1", + "portValue": 20000 } }, - "filterChains": [ + "filterChains": [ { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~grpc" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:grpc", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:grpc", + "virtualHosts": [ { - "name": "public_listener:grpc", - "domains": [ + "name": "public_listener:grpc", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:grpc" + "route": { + "cluster": "local_app:grpc" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.grpc_stats", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", - "statsForAllMethods": true + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true } }, { - "name": "envoy.filters.http.grpc_http1_bridge", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" + "name": "envoy.filters.http.grpc_http1_bridge", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config" } }, { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~http" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:http", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:http", + "virtualHosts": [ { - "name": "public_listener:http", - "domains": [ + "name": "public_listener:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:http" + "route": { + "cluster": "local_app:http" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "upgradeConfigs": [ + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~http2" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "public_listener", - "routeConfig": { - "name": "public_listener:http2", - "virtualHosts": [ + "name": "envoy.filters.network.http_connection_manager", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", + "statPrefix": "public_listener", + "routeConfig": { + "name": "public_listener:http2", + "virtualHosts": [ { - "name": "public_listener:http2", - "domains": [ + "name": "public_listener:http2", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "local_app:http2" + "route": { + "cluster": "local_app:http2" } } ] } ] }, - "httpFilters": [ + "httpFilters": [ { - "name": "envoy.filters.http.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", - "rules": {} + "name": "envoy.filters.http.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC", + "rules": {} } }, { - "name": "envoy.filters.http.router", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" + "name": "envoy.filters.http.router", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" } } ], - "tracing": { - "randomSampling": {} + "tracing": { + "randomSampling": {} }, - "http2ProtocolOptions": {}, - "upgradeConfigs": [ + "http2ProtocolOptions": {}, + "upgradeConfigs": [ { - "upgradeType": "websocket" + "upgradeType": "websocket" } ] } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } }, - "alpnProtocols": [ + "alpnProtocols": [ "h2", "http/1.1" ] }, - "requireClientCertificate": true + "requireClientCertificate": true } } }, { - "filterChainMatch": { - "applicationProtocols": [ + "filterChainMatch": { + "applicationProtocols": [ "consul~tcp" ] }, - "filters": [ + "filters": [ { - "name": "envoy.filters.network.rbac", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", - "rules": {}, - "statPrefix": "connect_authz" + "name": "envoy.filters.network.rbac", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC", + "rules": {}, + "statPrefix": "connect_authz" } }, { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "public_listener", - "cluster": "local_app:tcp" + "name": "envoy.filters.network.tcp_proxy", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", + "statPrefix": "public_listener", + "cluster": "local_app:tcp" } } ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": {}, - "tlsCertificates": [ + "transportSocket": { + "name": "tls", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", + "commonTlsContext": { + "tlsParams": {}, + "tlsCertificates": [ { - "certificateChain": { - "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" + "certificateChain": { + "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n" }, - "privateKey": { - "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" + "privateKey": { + "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } ], - "validationContext": { - "trustedCa": { - "inlineString": "some-root\nsome-other-root\n" + "validationContext": { + "trustedCa": { + "inlineString": "some-root\nsome-other-root\n" } } }, - "requireClientCertificate": true + "requireClientCertificate": true } } } ], - "listenerFilters": [ + "listenerFilters": [ { - "name": "envoy.filters.listener.tls_inspector", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" + "name": "envoy.filters.listener.tls_inspector", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector" } } ], - "trafficDirection": "INBOUND" + "trafficDirection": "INBOUND" } ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/l4-multi-destination-default-default.golden b/agent/xdsv2/testdata/routes/destination/l4-multi-destination-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/destination/l4-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/l4-multi-destination-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/l4-single-destination-ip-port-bind-address-default-default.golden b/agent/xdsv2/testdata/routes/destination/l4-single-destination-ip-port-bind-address-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/destination/l4-single-destination-ip-port-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/l4-single-destination-ip-port-bind-address-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/l4-single-destination-unix-socket-bind-address-default-default.golden b/agent/xdsv2/testdata/routes/destination/l4-single-destination-unix-socket-bind-address-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/destination/l4-single-destination-unix-socket-bind-address-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/l4-single-destination-unix-socket-bind-address-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/l4-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/l4-single-implicit-destination-tproxy-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/destination/l4-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/l4-single-implicit-destination-tproxy-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden index 28f9669ee3..01c1151dd9 100644 --- a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden @@ -1,67 +1,67 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "default/local/default/api-1:http:1.1.1.1:1234", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "default/default/api-1:http:1.1.1.1:1234", + "virtualHosts": [ { - "name": "default/local/default/api-1:http:1.1.1.1:1234", - "domains": [ + "name": "default/default/api-1:http:1.1.1.1:1234", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/split" + "match": { + "prefix": "/split" }, - "route": { - "weightedClusters": { - "clusters": [ + "route": { + "weightedClusters": { + "clusters": [ { - "name": "http.api-2.default.dc1.internal.foo.consul", - "weight": 60 + "name": "http.api-2.default.dc1.internal.foo.consul", + "weight": 60 }, { - "name": "http.api-1.default.dc1.internal.foo.consul", - "weight": 40 + "name": "http.api-1.default.dc1.internal.foo.consul", + "weight": 40 }, { - "name": "null_route_cluster", - "weight": 10 + "name": "null_route_cluster", + "weight": 10 } ] }, - "timeout": "77s" + "timeout": "77s" } }, { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "http.api-1.default.dc1.internal.foo.consul", - "timeout": "606s", - "retryPolicy": { - "retryOn": "connect-failure", - "numRetries": 4 + "route": { + "cluster": "http.api-1.default.dc1.internal.foo.consul", + "timeout": "606s", + "retryPolicy": { + "retryOn": "connect-failure", + "numRetries": 4 } } }, { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "null_route_cluster" + "route": { + "cluster": "null_route_cluster" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index c34c2a0602..36b5a1dc96 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -1,53 +1,53 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "default/local/default/api-app2:http", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "default/default/api-app2:http", + "virtualHosts": [ { - "name": "default/local/default/api-app2:http", - "domains": [ + "name": "default/default/api-app2:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "http.api-app2.default.dc1.internal.foo.consul" + "route": { + "cluster": "http.api-app2.default.dc1.internal.foo.consul" } } ] } ], - "validateClusters": true + "validateClusters": true }, { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "default/local/default/api-app:http", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "default/default/api-app:http", + "virtualHosts": [ { - "name": "default/local/default/api-app:http", - "domains": [ + "name": "default/default/api-app:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "http.api-app.default.dc1.internal.foo.consul" + "route": { + "cluster": "http.api-app.default.dc1.internal.foo.consul" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index caa0f6deb0..b9dfecfe03 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -1,30 +1,30 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "default/local/default/api-app:http", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "default/default/api-app:http", + "virtualHosts": [ { - "name": "default/local/default/api-app:http", - "domains": [ + "name": "default/default/api-app:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "http.api-app.default.dc1.internal.foo.consul" + "route": { + "cluster": "http.api-app.default.dc1.internal.foo.consul" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index caa0f6deb0..b9dfecfe03 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -1,30 +1,30 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "default/local/default/api-app:http", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "default/default/api-app:http", + "virtualHosts": [ { - "name": "default/local/default/api-app:http", - "domains": [ + "name": "default/default/api-app:http", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "http.api-app.default.dc1.internal.foo.consul" + "route": { + "cluster": "http.api-app.default.dc1.internal.foo.consul" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/l7-expose-paths-default-default.golden b/agent/xdsv2/testdata/routes/source/l7-expose-paths-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/l7-expose-paths-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/l7-expose-paths-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/local-and-inbound-connections-default-default.golden b/agent/xdsv2/testdata/routes/source/local-and-inbound-connections-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/local-and-inbound-connections-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/local-and-inbound-connections-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-with-specific-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-without-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiport-l4-workload-with-only-mesh-port-default-default.golden b/agent/xdsv2/testdata/routes/source/multiport-l4-workload-with-only-mesh-port-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiport-l4-workload-with-only-mesh-port-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiport-l4-workload-with-only-mesh-port-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xdsv2/testdata/routes/source/single-workload-address-without-ports-default-default.golden b/agent/xdsv2/testdata/routes/source/single-workload-address-without-ports-default-default.golden index 306f5220e7..9c050cbe6b 100644 --- a/agent/xdsv2/testdata/routes/source/single-workload-address-without-ports-default-default.golden +++ b/agent/xdsv2/testdata/routes/source/single-workload-address-without-ports-default-default.golden @@ -1,5 +1,5 @@ { - "versionInfo": "00000001", - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "versionInfo": "00000001", + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/command/resource/apply-grpc/apply_test.go b/command/resource/apply-grpc/apply_test.go index e4e0cbbb23..7b338a0283 100644 --- a/command/resource/apply-grpc/apply_test.go +++ b/command/resource/apply-grpc/apply_test.go @@ -96,7 +96,6 @@ func TestResourceApplyCommand_StdIn(t *testing.T) { Tenancy { Partition = "default" Namespace = "default" - PeerName = "local" } } @@ -146,8 +145,7 @@ func TestResourceApplyCommand_StdIn(t *testing.T) { "name": "korn", "tenancy": { "partition": "default", - "namespace": "default", - "peerName": "local" + "namespace": "default" }, "type": { "group": "demo", diff --git a/command/resource/apply/apply.go b/command/resource/apply/apply.go index df3f136c50..cf92af9474 100644 --- a/command/resource/apply/apply.go +++ b/command/resource/apply/apply.go @@ -116,7 +116,6 @@ func (c *cmd) Run(args []string) int { opts := &client.QueryOptions{ Namespace: parsedResource.Id.Tenancy.GetNamespace(), Partition: parsedResource.Id.Tenancy.GetPartition(), - Peer: parsedResource.Id.Tenancy.GetPeerName(), Token: c.http.Token(), } @@ -187,7 +186,6 @@ Usage: consul resource apply [options] Tenancy { Namespace = "default" Partition = "default" - PeerName = "local" } } diff --git a/command/resource/apply/apply_test.go b/command/resource/apply/apply_test.go index 2644e7aaeb..a6cb1b6929 100644 --- a/command/resource/apply/apply_test.go +++ b/command/resource/apply/apply_test.go @@ -109,7 +109,6 @@ func TestResourceApplyCommand_StdIn(t *testing.T) { Tenancy { Namespace = "default" Partition = "default" - PeerName = "local" } } @@ -134,7 +133,7 @@ func TestResourceApplyCommand_StdIn(t *testing.T) { } code := c.Run(args) - require.Equal(t, 0, code) + require.Equal(t, 0, code, ui.ErrorWriter.String()) require.Empty(t, ui.ErrorWriter.String()) expected := readResource(t, a, []string{"demo.v2.Artist", "korn"}) require.Contains(t, ui.OutputWriter.String(), "demo.v2.Artist 'korn' created.") @@ -157,8 +156,7 @@ func TestResourceApplyCommand_StdIn(t *testing.T) { "name": "korn", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "demo", @@ -183,7 +181,7 @@ func TestResourceApplyCommand_StdIn(t *testing.T) { } code := c.Run(args) - require.Equal(t, 0, code) + require.Equal(t, 0, code, ui.ErrorWriter.String()) require.Empty(t, ui.ErrorWriter.String()) expected := readResource(t, a, []string{"demo.v2.Artist", "korn"}) require.Contains(t, ui.OutputWriter.String(), "demo.v2.Artist 'korn' created.") diff --git a/command/resource/client/client.go b/command/resource/client/client.go index 3d201a6f9c..7113e4e587 100644 --- a/command/resource/client/client.go +++ b/command/resource/client/client.go @@ -109,9 +109,6 @@ type QueryOptions struct { // by the Config Datacenter string - // Providing a peer name in the query option - Peer string - // AllowStale allows any Consul server (non-leader) to service // a read. This allows for lower latency and higher throughput AllowStale bool @@ -766,15 +763,13 @@ func (r *request) SetQueryOptions(q *QueryOptions) { // rather than the alternative short-hand "ap" r.params.Set("partition", q.Partition) } + // TODO(peering/v2) handle peer tenancy if q.Datacenter != "" { // For backwards-compatibility with existing tests, // use the short-hand query param name "dc" // rather than the alternative long-hand "datacenter" r.params.Set("dc", q.Datacenter) } - if q.Peer != "" { - r.params.Set("peer", q.Peer) - } if q.AllowStale { r.params.Set("stale", "") } diff --git a/command/resource/delete-grpc/delete.go b/command/resource/delete-grpc/delete.go index af2a5c7fb4..c924a6bb9d 100644 --- a/command/resource/delete-grpc/delete.go +++ b/command/resource/delete-grpc/delete.go @@ -99,7 +99,6 @@ func (c *cmd) Run(args []string) int { resourceTenancy = &pbresource.Tenancy{ Partition: c.resourceFlags.Partition(), Namespace: c.resourceFlags.Namespace(), - PeerName: c.resourceFlags.Peername(), } } diff --git a/command/resource/delete/delete.go b/command/resource/delete/delete.go index 43310d7e08..c0750210fe 100644 --- a/command/resource/delete/delete.go +++ b/command/resource/delete/delete.go @@ -39,7 +39,8 @@ func (c *cmd) init() { flags.Merge(c.flags, c.http.ClientFlags()) flags.Merge(c.flags, c.http.ServerFlags()) flags.Merge(c.flags, c.http.MultiTenancyFlags()) - flags.Merge(c.flags, c.http.AddPeerName()) + // TODO(peering/v2) add back ability to query peers + // flags.Merge(c.flags, c.http.AddPeerName()) c.help = flags.Usage(help, c.flags) } @@ -77,7 +78,6 @@ func (c *cmd) Run(args []string) int { opts = &client.QueryOptions{ Namespace: parsedResource.Id.Tenancy.GetNamespace(), Partition: parsedResource.Id.Tenancy.GetPartition(), - Peer: parsedResource.Id.Tenancy.GetPeerName(), Token: c.http.Token(), } } else { @@ -111,7 +111,6 @@ func (c *cmd) Run(args []string) int { opts = &client.QueryOptions{ Namespace: c.http.Namespace(), Partition: c.http.Partition(), - Peer: c.http.PeerName(), Token: c.http.Token(), } } @@ -149,24 +148,23 @@ const help = ` Usage: You have two options to delete the resource specified by the given type, name, partition, namespace and peer and outputs its JSON representation. -consul resource delete [type] [name] -partition= -namespace= -peer= +consul resource delete [type] [name] -partition= -namespace= consul resource delete -f [resource_file_path] But you could only use one of the approaches. Example: -$ consul resource delete catalog.v2beta1.Service card-processor -partition=billing -namespace=payments -peer=eu +$ consul resource delete catalog.v2beta1.Service card-processor -partition=billing -namespace=payments $ consul resource delete -f resource.hcl In resource.hcl, it could be: ID { - Type = gvk("catalog.v2beta1.Service") - Name = "card-processor" - Tenancy { - Namespace = "payments" - Partition = "billing" - PeerName = "eu" - } + Type = gvk("catalog.v2beta1.Service") + Name = "card-processor" + Tenancy { + Namespace = "payments" + Partition = "billing" + } } ` diff --git a/command/resource/delete/delete_test.go b/command/resource/delete/delete_test.go index 75926088ba..8e12aa486d 100644 --- a/command/resource/delete/delete_test.go +++ b/command/resource/delete/delete_test.go @@ -129,13 +129,13 @@ func TestResourceDelete(t *testing.T) { }, { name: "delete resource in command line format", - args: []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default", "-peer=local"}, + args: []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default"}, expectedCode: 0, createResource: true, }, { name: "delete resource that doesn't exist in command line format", - args: []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default", "-peer=local"}, + args: []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default"}, expectedCode: 0, createResource: false, }, diff --git a/command/resource/helper.go b/command/resource/helper.go index 516b40cbb3..69a06d9cc1 100644 --- a/command/resource/helper.go +++ b/command/resource/helper.go @@ -38,9 +38,10 @@ type OuterResource struct { type Tenancy struct { Partition string `json:"partition"` Namespace string `json:"namespace"` - PeerName string `json:"peerName"` } +// TODO(peering/v2) handle v2 peering in the resource cli + type Type struct { Group string `json:"group"` GroupVersion string `json:"groupVersion"` diff --git a/command/resource/helper_test.go b/command/resource/helper_test.go index 003c2b7aa6..1b3d6cbb29 100644 --- a/command/resource/helper_test.go +++ b/command/resource/helper_test.go @@ -4,8 +4,9 @@ package resource import ( - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" ) func Test_parseJson(t *testing.T) { @@ -14,8 +15,8 @@ func Test_parseJson(t *testing.T) { js string wantErr bool }{ - {"valid resource", "{\n \"data\": {\n \"genre\": \"GENRE_METAL\",\n \"name\": \"Korn\"\n },\n \"generation\": \"01HAYWBPV1KMT2KWECJ6CEWDQ0\",\n \"id\": {\n \"name\": \"korn\",\n \"tenancy\": {\n \"namespace\": \"default\",\n \"partition\": \"default\",\n \"peerName\": \"local\"\n },\n \"type\": {\n \"group\": \"demo\",\n \"groupVersion\": \"v2\",\n \"kind\": \"Artist\"\n },\n \"uid\": \"01HAYWBPV1KMT2KWECJ4NW88S1\"\n },\n \"metadata\": {\n \"foo\": \"bar\"\n },\n \"version\": \"18\"\n}", false}, - {"invalid resource", "{\n \"data\": {\n \"genre\": \"GENRE_METAL\",\n \"name\": \"Korn\"\n },\n \"id\": {\n \"name\": \"korn\",\n \"tenancy\": {\n \"namespace\": \"default\",\n \"partition\": \"default\",\n \"peerName\": \"local\"\n },\n \"type\": \"\"\n },\n \"metadata\": {\n \"foo\": \"bar\"\n }\n}\n", true}, + {"valid resource", "{\n \"data\": {\n \"genre\": \"GENRE_METAL\",\n \"name\": \"Korn\"\n },\n \"generation\": \"01HAYWBPV1KMT2KWECJ6CEWDQ0\",\n \"id\": {\n \"name\": \"korn\",\n \"tenancy\": {\n \"namespace\": \"default\",\n \"partition\": \"default\"\n },\n \"type\": {\n \"group\": \"demo\",\n \"groupVersion\": \"v2\",\n \"kind\": \"Artist\"\n },\n \"uid\": \"01HAYWBPV1KMT2KWECJ4NW88S1\"\n },\n \"metadata\": {\n \"foo\": \"bar\"\n },\n \"version\": \"18\"\n}", false}, + {"invalid resource", "{\n \"data\": {\n \"genre\": \"GENRE_METAL\",\n \"name\": \"Korn\"\n },\n \"id\": {\n \"name\": \"korn\",\n \"tenancy\": {\n \"namespace\": \"default\",\n \"partition\": \"default\"\n },\n \"type\": \"\"\n },\n \"metadata\": {\n \"foo\": \"bar\"\n }\n}\n", true}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/command/resource/list-grpc/list.go b/command/resource/list-grpc/list.go index cd91603cd8..eea7621b9e 100644 --- a/command/resource/list-grpc/list.go +++ b/command/resource/list-grpc/list.go @@ -108,7 +108,6 @@ func (c *cmd) Run(args []string) int { resourceTenancy = &pbresource.Tenancy{ Partition: c.resourceFlags.Partition(), Namespace: c.resourceFlags.Namespace(), - PeerName: c.resourceFlags.Peername(), } } diff --git a/command/resource/list/list.go b/command/resource/list/list.go index f7eab97977..55e8b503fb 100644 --- a/command/resource/list/list.go +++ b/command/resource/list/list.go @@ -40,7 +40,8 @@ func (c *cmd) init() { flags.Merge(c.flags, c.http.ClientFlags()) flags.Merge(c.flags, c.http.ServerFlags()) flags.Merge(c.flags, c.http.MultiTenancyFlags()) - flags.Merge(c.flags, c.http.AddPeerName()) + // TODO(peering/v2) add back ability to query peers + // flags.Merge(c.flags, c.http.AddPeerName()) c.help = flags.Usage(help, c.flags) } @@ -76,7 +77,6 @@ func (c *cmd) Run(args []string) int { opts = &client.QueryOptions{ Namespace: parsedResource.Id.Tenancy.GetNamespace(), Partition: parsedResource.Id.Tenancy.GetPartition(), - Peer: parsedResource.Id.Tenancy.GetPeerName(), Token: c.http.Token(), RequireConsistent: !c.http.Stale(), } @@ -107,7 +107,6 @@ func (c *cmd) Run(args []string) int { opts = &client.QueryOptions{ Namespace: c.http.Namespace(), Partition: c.http.Partition(), - Peer: c.http.PeerName(), Token: c.http.Token(), RequireConsistent: !c.http.Stale(), } @@ -172,7 +171,7 @@ func (c *cmd) Help() string { const synopsis = "Reads all resources by type" const help = ` -Usage: consul resource list [type] -partition= -namespace= -peer= +Usage: consul resource list [type] -partition= -namespace= or consul resource list -f [path/to/file.hcl] @@ -181,7 +180,7 @@ and outputs in JSON format. Example: -$ consul resource list catalog.v2beta1.Service card-processor -partition=billing -namespace=payments -peer=eu +$ consul resource list catalog.v2beta1.Service card-processor -partition=billing -namespace=payments $ consul resource list -f=demo.hcl @@ -193,7 +192,6 @@ ID { Tenancy { Namespace = "default" Partition = "default" - PeerName = "local" } } ` diff --git a/command/resource/list/list_test.go b/command/resource/list/list_test.go index 3cec8d609f..92afe4a6dc 100644 --- a/command/resource/list/list_test.go +++ b/command/resource/list/list_test.go @@ -50,7 +50,6 @@ func TestResourceListCommand(t *testing.T) { extraArgs: []string{ "demo.v2.artist", "-namespace=default", - "-peer=local", "-partition=default", }, }, @@ -132,7 +131,6 @@ func TestResourceListInvalidArgs(t *testing.T) { args: []string{ "demo.v2.artist", "-namespace=default", - "-peer=local", "-partition=default", "-http-addr=" + a.HTTPAddr(), "-token=root", @@ -145,7 +143,6 @@ func TestResourceListInvalidArgs(t *testing.T) { args: []string{ "test", "-namespace=default", - "-peer=local", "-partition=default", }, expectedCode: 1, @@ -156,7 +153,6 @@ func TestResourceListInvalidArgs(t *testing.T) { "demo.v2.artist", "test", "-namespace=default", - "-peer=local", "-partition=default", }, expectedCode: 1, diff --git a/command/resource/read-grpc/read.go b/command/resource/read-grpc/read.go index a3d9a6ff93..c681074ba7 100644 --- a/command/resource/read-grpc/read.go +++ b/command/resource/read-grpc/read.go @@ -100,7 +100,6 @@ func (c *cmd) Run(args []string) int { resourceTenancy = &pbresource.Tenancy{ Partition: c.resourceFlags.Partition(), Namespace: c.resourceFlags.Namespace(), - PeerName: c.resourceFlags.Peername(), } } diff --git a/command/resource/read/read.go b/command/resource/read/read.go index aaefc2a5aa..32a39cd1fd 100644 --- a/command/resource/read/read.go +++ b/command/resource/read/read.go @@ -40,7 +40,8 @@ func (c *cmd) init() { flags.Merge(c.flags, c.http.ClientFlags()) flags.Merge(c.flags, c.http.ServerFlags()) flags.Merge(c.flags, c.http.MultiTenancyFlags()) - flags.Merge(c.flags, c.http.AddPeerName()) + // TODO(peering/v2) add back ability to query peers + // flags.Merge(c.flags, c.http.AddPeerName()) c.help = flags.Usage(help, c.flags) } @@ -78,7 +79,6 @@ func (c *cmd) Run(args []string) int { opts = &client.QueryOptions{ Namespace: parsedResource.Id.Tenancy.GetNamespace(), Partition: parsedResource.Id.Tenancy.GetPartition(), - Peer: parsedResource.Id.Tenancy.GetPeerName(), Token: c.http.Token(), RequireConsistent: !c.http.Stale(), } @@ -113,7 +113,6 @@ func (c *cmd) Run(args []string) int { opts = &client.QueryOptions{ Namespace: c.http.Namespace(), Partition: c.http.Partition(), - Peer: c.http.PeerName(), Token: c.http.Token(), RequireConsistent: !c.http.Stale(), } @@ -159,14 +158,14 @@ const help = ` Usage: You have two options to read the resource specified by the given type, name, partition, namespace and peer and outputs its JSON representation. -consul resource read [type] [name] -partition= -namespace= -peer= +consul resource read [type] [name] -partition= -namespace= consul resource read -f [resource_file_path] But you could only use one of the approaches. Example: -$ consul resource read catalog.v2beta1.Service card-processor -partition=billing -namespace=payments -peer=eu +$ consul resource read catalog.v2beta1.Service card-processor -partition=billing -namespace=payments $ consul resource read -f resource.hcl In resource.hcl, it could be: @@ -176,7 +175,6 @@ ID { Tenancy { Namespace = "payments" Partition = "billing" - PeerName = "eu" } } ` diff --git a/command/resource/read/read_test.go b/command/resource/read/read_test.go index 7eea7b836b..1a4de5703e 100644 --- a/command/resource/read/read_test.go +++ b/command/resource/read/read_test.go @@ -131,13 +131,13 @@ func TestResourceRead(t *testing.T) { }, { name: "read resource in command line format", - args: []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default", "-peer=local"}, + args: []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default"}, expectedCode: 0, errMsg: "", }, { name: "read resource that doesn't exist", - args: []string{"demo.v2.Artist", "fake-korn", "-partition=default", "-namespace=default", "-peer=local"}, + args: []string{"demo.v2.Artist", "fake-korn", "-partition=default", "-namespace=default"}, expectedCode: 1, errMsg: "Error reading resource demo.v2.Artist/fake-korn: Unexpected response code: 404 (rpc error: code = NotFound desc = resource not found)\n", }, diff --git a/command/resource/resource.go b/command/resource/resource.go index 709b03e4e4..e7a74e498b 100644 --- a/command/resource/resource.go +++ b/command/resource/resource.go @@ -37,7 +37,7 @@ in the subcommands or the documentation. Read a resource: -$ consul resource read [type] [name] -partition= -namespace= -peer= -consistent= -json +$ consul resource read [type] [name] -partition= -namespace= -consistent= -json Write/update a resource: @@ -45,7 +45,7 @@ $ consul resource apply -f= List resources by type: -$ consul resource list [type] -partition= -namespace= -peer= +$ consul resource list [type] -partition= -namespace= Run diff --git a/command/resource/testdata/demo.hcl b/command/resource/testdata/demo.hcl index 8185a541db..9449bb0de7 100644 --- a/command/resource/testdata/demo.hcl +++ b/command/resource/testdata/demo.hcl @@ -7,7 +7,6 @@ ID { Tenancy { Partition = "default" Namespace = "default" - PeerName = "local" } } diff --git a/command/resource/testdata/invalid.hcl b/command/resource/testdata/invalid.hcl index bb97cf59f8..5ab99b674c 100644 --- a/command/resource/testdata/invalid.hcl +++ b/command/resource/testdata/invalid.hcl @@ -7,7 +7,6 @@ ID { Tenancy { Partition = "default" Namespace = "default" - PeerName = "local" } } diff --git a/command/resource/testdata/invalid_type.hcl b/command/resource/testdata/invalid_type.hcl index 7b7761a40a..4b791bdffb 100644 --- a/command/resource/testdata/invalid_type.hcl +++ b/command/resource/testdata/invalid_type.hcl @@ -6,6 +6,5 @@ D { Tenancy { Partition = "default" Namespace = "default" - PeerName = "local" } } diff --git a/docs/v2-architecture/controller-architecture/guide.md b/docs/v2-architecture/controller-architecture/guide.md index fdb907371c..49ff97b77c 100644 --- a/docs/v2-architecture/controller-architecture/guide.md +++ b/docs/v2-architecture/controller-architecture/guide.md @@ -109,7 +109,6 @@ $ grpcurl -d @ \ }, "tenancy": { "partition": "default", - "peer_name": "local", "namespace": "default" } }, diff --git a/internal/auth/internal/controllers/trafficpermissions/controller_test.go b/internal/auth/internal/controllers/trafficpermissions/controller_test.go index ab9e526a15..f0f4eb1661 100644 --- a/internal/auth/internal/controllers/trafficpermissions/controller_test.go +++ b/internal/auth/internal/controllers/trafficpermissions/controller_test.go @@ -107,7 +107,7 @@ func (suite *controllerSuite) TestReconcile_CTPCreate_ReferencingTrafficPermissi IdentityName: "foo", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -131,7 +131,7 @@ func (suite *controllerSuite) TestReconcile_CTPCreate_ReferencingTrafficPermissi IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -167,7 +167,7 @@ func (suite *controllerSuite) TestReconcile_WorkloadIdentityDelete_ReferencingTr IdentityName: "foo", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -192,7 +192,7 @@ func (suite *controllerSuite) TestReconcile_WorkloadIdentityDelete_ReferencingTr IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -263,7 +263,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsCreate_Destination IdentityName: "foo", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithTenancy(tenancy).WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -281,7 +281,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsCreate_Destination IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithTenancy(tenancy).WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -309,7 +309,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsCreate_Destination IdentityName: "wi3", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp3 := rtest.Resource(pbauth.TrafficPermissionsType, "tp3").WithTenancy(tenancy).WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -361,7 +361,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_Destination IdentityName: "foo", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -380,7 +380,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_Destination IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -427,7 +427,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_Destination IdentityName: "foo", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -451,7 +451,7 @@ func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_Destination IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, } tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{ @@ -506,7 +506,7 @@ func (suite *controllerSuite) TestControllerBasic() { IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } @@ -532,7 +532,7 @@ func (suite *controllerSuite) TestControllerBasic() { IdentityName: "wi1", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } @@ -637,7 +637,7 @@ func (suite *controllerSuite) TestControllerBasicWithMultipleTenancyLevels() { IdentityName: "wi2", Namespace: "bar", Partition: "foo", - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } @@ -663,7 +663,7 @@ func (suite *controllerSuite) TestControllerBasicWithMultipleTenancyLevels() { IdentityName: "wi2", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } @@ -732,7 +732,7 @@ func (suite *controllerSuite) TestControllerMultipleTrafficPermissions() { IdentityName: "wi2", Namespace: tenancy.Namespace, Partition: tenancy.Partition, - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } @@ -750,7 +750,7 @@ func (suite *controllerSuite) TestControllerMultipleTrafficPermissions() { IdentityName: "wi3", Namespace: tenancy.Namespace, Partition: tenancy.Partition, - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } @@ -780,7 +780,7 @@ func (suite *controllerSuite) TestControllerMultipleTrafficPermissions() { IdentityName: "wi4", Namespace: tenancy.Namespace, Partition: tenancy.Partition, - Peer: "local", + Peer: resource.DefaultPeerName, }}, DestinationRules: nil, } diff --git a/internal/auth/internal/types/traffic_permissions.go b/internal/auth/internal/types/traffic_permissions.go index a9f999077b..b19b9559f5 100644 --- a/internal/auth/internal/types/traffic_permissions.go +++ b/internal/auth/internal/types/traffic_permissions.go @@ -50,7 +50,9 @@ func normalizedTenancyForSource(src *pbauth.Source, parentTenancy *pbresource.Te if t, c := defaultedSourceTenancy(src, parentTenancy); c { src.Partition = t.Partition - src.Peer = t.PeerName + // TODO(peering/v2) revisit default peer source + // src.Peer = t.PeerName + src.Peer = resource.DefaultPeerName src.Namespace = t.Namespace changed = true } @@ -58,7 +60,9 @@ func normalizedTenancyForSource(src *pbauth.Source, parentTenancy *pbresource.Te for _, e := range src.Exclude { if t, c := defaultedSourceTenancy(e, parentTenancy); c { e.Partition = t.Partition - e.Peer = t.PeerName + // TODO(peering/v2) revisit default peer source + // e.Peer = t.PeerName + e.Peer = resource.DefaultPeerName e.Namespace = t.Namespace changed = true } @@ -74,8 +78,9 @@ func defaultedSourceTenancy(s pbauth.SourceToSpiffe, parentTenancy *pbresource.T tenancy := pbauth.SourceToTenancy(s) - var peerChanged bool - tenancy.PeerName, peerChanged = firstNonEmptyString(tenancy.PeerName, parentTenancy.PeerName, resource.DefaultPeerName) + // TODO(peering/v2) default peer name somehow + // var peerChanged bool + // tenancy.PeerName, peerChanged = firstNonEmptyString(tenancy.PeerName, parentTenancy.PeerName, resource.DefaultPeerName) var partitionChanged bool tenancy.Partition, partitionChanged = firstNonEmptyString(tenancy.Partition, parentTenancy.Partition, resource.DefaultPartitionName) @@ -89,7 +94,8 @@ func defaultedSourceTenancy(s pbauth.SourceToSpiffe, parentTenancy *pbresource.T } } - return tenancy, peerChanged || partitionChanged || namespaceChanged + // TODO(peering/v2) take peer being changed into account + return tenancy, partitionChanged || namespaceChanged // || peerChange } func firstNonEmptyString(a, b, c string) (string, bool) { @@ -268,7 +274,7 @@ func sourceHasIncompatibleTenancies(src pbauth.SourceToSpiffe, id *pbresource.ID if id.Tenancy == nil { id.Tenancy = &pbresource.Tenancy{} } - peerSet := src.GetPeer() != resource.DefaultPeerName + peerSet := !isLocalPeer(src.GetPeer()) apSet := src.GetPartition() != id.Tenancy.Partition sgSet := src.GetSamenessGroup() != "" diff --git a/internal/auth/internal/types/traffic_permissions_test.go b/internal/auth/internal/types/traffic_permissions_test.go index 263ea09109..7e780e9e2f 100644 --- a/internal/auth/internal/types/traffic_permissions_test.go +++ b/internal/auth/internal/types/traffic_permissions_test.go @@ -554,7 +554,8 @@ func TestMutateTrafficPermissions(t *testing.T) { IdentityName: "i1", Namespace: "ns1", Partition: "ap1", - Peer: "local", + // TODO(peering/v2) revisit peer defaulting + // Peer: "local", }, { IdentityName: "i1", @@ -621,7 +622,8 @@ func TestMutateTrafficPermissions(t *testing.T) { IdentityName: "i1", Namespace: "ns1", Partition: "ap1", - Peer: "local", + // TODO(peering/v2) revisit peer defaulting + // Peer: "local", }, { IdentityName: "i1", @@ -640,7 +642,6 @@ func TestMutateTrafficPermissions(t *testing.T) { policyTenancy: &pbresource.Tenancy{ Partition: "ap1", Namespace: "ns3", - PeerName: "local", }, tp: &pbauth.TrafficPermissions{ Permissions: []*pbauth.Permission{ @@ -695,7 +696,8 @@ func TestMutateTrafficPermissions(t *testing.T) { IdentityName: "i1", Namespace: "ns1", Partition: "ap5", - Peer: "local", + // TODO(peering/v2) revisit to figure out defaulting + // Peer: "local", }, { IdentityName: "i1", @@ -724,7 +726,6 @@ func TestMutateTrafficPermissions(t *testing.T) { policyTenancy: &pbresource.Tenancy{ Partition: "ap1", Namespace: "ns3", - PeerName: "local", }, tp: &pbauth.TrafficPermissions{ Permissions: []*pbauth.Permission{ @@ -783,7 +784,8 @@ func TestMutateTrafficPermissions(t *testing.T) { IdentityName: "i1", Namespace: "ns1", Partition: "ap5", - Peer: "local", + // TODO(peering/v2) revisit peer defaulting + // Peer: "local", }, { IdentityName: "i1", diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json index 5509e726d8..bfd1895674 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api" }, @@ -34,4 +33,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json index d64671960a..ab5a6754ac 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-1-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-1" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_PASSING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json index fe7d6318fb..da8d846640 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-1" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-1" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json index f1f4c05968..448827ae0c 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-10-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-10" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_WARNING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json index 768cab21d0..30da8cb5c0 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-10" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-3" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json index 4c266d4e2a..a377cc718a 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-11-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-11" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_CRITICAL" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json index c011003456..7e32d1a0f8 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-11" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-3" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json index 9b8079ed4a..4de104d6a7 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-12-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-12" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_MAINTENANCE" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json index 0c406c0ecd..e825f7f180 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-12" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-3" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json index 346ebfb2f4..2ce30c8b4e 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-13-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-13" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_PASSING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json index acedb1ebd4..2018b564f7 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-13" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-4" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json index 9a97dfda14..ed79d054f6 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-14-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-14" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_WARNING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json index fefe9dabcf..a11875d6fb 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-14" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-4" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json index b289dd269e..24d6a03c92 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-15-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-15" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_CRITICAL" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json index faddd57fe7..cd5719b587 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-15" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-4" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json index e4de67be79..181d10c812 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-16-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-16" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_MAINTENANCE" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json index 46590c467f..e008698551 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-16" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-4" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json index e9955bf209..a05c5e3c43 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-17-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-17" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_PASSING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json index bf3069201f..06e18f90c7 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-17" }, @@ -42,4 +41,4 @@ }, "identity": "api" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json index ec84906012..10726bc6b2 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-18-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-18" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_WARNING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json index cb96652199..223fe2d5d2 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-18" }, @@ -42,4 +41,4 @@ }, "identity": "api" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json index d353aac240..c4a0886bf8 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-19-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-19" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_CRITICAL" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json index dcf2cf4b03..9ba023ad71 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-19" }, @@ -42,4 +41,4 @@ }, "identity": "api" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json index 08165a75d0..b273e9dc76 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-2-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-2" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_WARNING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json index cc2ea0fdc2..9ea51759d7 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-2" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-1" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json index 4928315058..fdd942caf6 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-20-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-20" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_MAINTENANCE" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json index 315874eeaf..d1d120fd54 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-20" }, @@ -42,4 +41,4 @@ }, "identity": "api" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json index 44bc2a3531..681b252277 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-3-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-3" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_CRITICAL" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json index 2ecd501d6e..5b64c9c0b2 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-3" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-1" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json index 5ead7793f1..bb26912de6 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-4-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-4" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_MAINTENANCE" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json index 639fdd3f67..14dd23c6df 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-4" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-1" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json index f2f1013f20..8fc13c8d3a 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-5-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-5" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_PASSING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json index 0e19253d4d..ff7eb70930 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-5" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-2" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json index ef0bef454b..c09af90b52 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-6-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-6" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_WARNING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json index fe9780e946..5c705bff75 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-6" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-2" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json index f3c963481e..a8c80bc5bb 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-7-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-7" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_CRITICAL" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json index 7199c042b8..853e363a90 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-7" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-2" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json index e55348b1ea..e3f73b716e 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-8-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-8" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_MAINTENANCE" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json index 8828e1ee26..a7bb1eda2a 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-8" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-2" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json index 81ac189b17..da85d4f72b 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-9-health" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-9" }, @@ -30,4 +28,4 @@ "type": "synthetic", "status": "HEALTH_PASSING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json index 1c02d466fb..3f3010fa1d 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "api-9" }, @@ -43,4 +42,4 @@ "identity": "api", "node_name": "node-3" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json index a980939a96..09059f753d 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "foo" }, @@ -20,8 +19,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "foo" }, @@ -44,4 +42,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json index 3793dd07b0..fa6274962b 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "foo" }, @@ -21,4 +20,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json index 7dff2ee10f..317e9f7c81 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "grpc-api" }, @@ -39,4 +38,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json index 02b80d29ae..fdb4a31a15 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json @@ -7,8 +7,7 @@ }, "tenancy": { "partition": "default", - "namespace": "default", - "peer_name": "local" + "namespace": "default" }, "name": "http-api" }, @@ -26,4 +25,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json index 45cf150301..9d7ad08131 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json @@ -6,8 +6,7 @@ "kind": "NodeHealthStatus" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-1-health" }, @@ -18,8 +17,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-1" }, @@ -28,4 +26,4 @@ "type": "synthetic", "status": "HEALTH_PASSING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json index e9f78a0336..f1a6021dce 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json @@ -6,8 +6,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-1" }, @@ -23,4 +22,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json index ed1958e644..a3f08d7285 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json @@ -6,8 +6,7 @@ "kind": "NodeHealthStatus" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-2-health" }, @@ -18,8 +17,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-2" }, @@ -28,4 +26,4 @@ "type": "synthetic", "status": "HEALTH_WARNING" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json index f51b598c7b..b6078e02ac 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json @@ -6,8 +6,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-2" }, @@ -23,4 +22,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json index 0257dc2f0c..ee92db7cba 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json @@ -6,8 +6,7 @@ "kind": "NodeHealthStatus" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-3-health" }, @@ -18,8 +17,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-3" }, @@ -28,4 +26,4 @@ "type": "synthetic", "status": "HEALTH_CRITICAL" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json index 6fb149e2ce..717ebfdc2e 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json @@ -6,8 +6,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-3" }, @@ -23,4 +22,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json index 2da46f58cb..16451bf0d4 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json @@ -6,8 +6,7 @@ "kind": "NodeHealthStatus" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-4-health" }, @@ -18,8 +17,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-4" }, @@ -28,4 +26,4 @@ "type": "synthetic", "status": "HEALTH_MAINTENANCE" } -} \ No newline at end of file +} diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json index bea561ace5..0c2f1f4eb4 100644 --- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json +++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json @@ -6,8 +6,7 @@ "kind": "Node" }, "tenancy": { - "partition": "default", - "peer_name": "local" + "partition": "default" }, "name": "node-4" }, @@ -23,4 +22,4 @@ } ] } -} \ No newline at end of file +} diff --git a/internal/catalog/internal/controllers/failover/controller.go b/internal/catalog/internal/controllers/failover/controller.go index e2dc8accf3..30761b1c3b 100644 --- a/internal/catalog/internal/controllers/failover/controller.go +++ b/internal/catalog/internal/controllers/failover/controller.go @@ -235,7 +235,6 @@ func computeNewConditions( Type: pbmulticluster.SamenessGroupType, Tenancy: &pbresource.Tenancy{ Partition: fpRes.GetId().GetTenancy().GetPartition(), - PeerName: resource.DefaultPeerName, }, Name: sg, } diff --git a/internal/catalog/internal/types/failover_policy.go b/internal/catalog/internal/types/failover_policy.go index 2e9546b336..f3e9eb7bd9 100644 --- a/internal/catalog/internal/types/failover_policy.go +++ b/internal/catalog/internal/types/failover_policy.go @@ -68,21 +68,14 @@ func mutateFailoverPolicy(res *DecodedFailoverPolicy) (bool, error) { } func mutateFailoverConfig(policyTenancy *pbresource.Tenancy, config *pbcatalog.FailoverConfig) (changed bool) { - if policyTenancy != nil && !isLocalPeer(policyTenancy.PeerName) { - // TODO(peering/v2): remove this bypass when we know what to do with - // non-local peer references. - return false - } + // TODO(peering/v2): Add something here when we know what to do with non-local peer references for _, dest := range config.Destinations { if dest.Ref == nil { continue } - if dest.Ref.Tenancy != nil && !isLocalPeer(dest.Ref.Tenancy.PeerName) { - // TODO(peering/v2): remove this bypass when we know what to do with - // non-local peer references. - continue - } + + // TODO(peering/v2): Add something here to handle non-local peer references orig := proto.Clone(dest.Ref).(*pbresource.Reference) resource.DefaultReferenceTenancy( @@ -100,7 +93,7 @@ func mutateFailoverConfig(policyTenancy *pbresource.Tenancy, config *pbcatalog.F } func isLocalPeer(p string) bool { - return p == "local" || p == "" + return p == resource.DefaultPeerName || p == "" } var ValidateFailoverPolicy = resource.DecodeAndValidate(validateFailoverPolicy) @@ -248,18 +241,6 @@ func validateFailoverPolicyDestination(dest *pbcatalog.FailoverDestination, port } } - hasPeer := false - if dest.Ref != nil { - hasPeer = dest.Ref.Tenancy.PeerName != "" && dest.Ref.Tenancy.PeerName != "local" - } - - if hasPeer && dest.Datacenter != "" { - merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{ - Name: "datacenter", - Wrapped: fmt.Errorf("ref.tenancy.peer_name and datacenter are mutually exclusive fields"), - })) - } - return merr } diff --git a/internal/catalog/internal/types/health_checks_test.go b/internal/catalog/internal/types/health_checks_test.go index c9cdf01ae8..c1f3846c4c 100644 --- a/internal/catalog/internal/types/health_checks_test.go +++ b/internal/catalog/internal/types/health_checks_test.go @@ -25,7 +25,6 @@ func createHealthChecksResource(t *testing.T, data protoreflect.ProtoMessage) *p Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "test-checks", }, diff --git a/internal/catalog/internal/types/health_status_test.go b/internal/catalog/internal/types/health_status_test.go index 58c22fd720..31e59433ad 100644 --- a/internal/catalog/internal/types/health_status_test.go +++ b/internal/catalog/internal/types/health_status_test.go @@ -20,7 +20,6 @@ var ( defaultHealthStatusOwnerTenancy = &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", } defaultHealthStatusOwner = &pbresource.ID{ @@ -37,7 +36,6 @@ func createHealthStatusResource(t *testing.T, data protoreflect.ProtoMessage, ow Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "test-status", }, diff --git a/internal/catalog/internal/types/node_health_status_test.go b/internal/catalog/internal/types/node_health_status_test.go index a612114765..9590251ab2 100644 --- a/internal/catalog/internal/types/node_health_status_test.go +++ b/internal/catalog/internal/types/node_health_status_test.go @@ -18,7 +18,6 @@ import ( var ( defaultNodeHealthStatusOwnerTenancy = &pbresource.Tenancy{ Partition: "default", - PeerName: "local", } defaultNodeHealthStatusOwner = &pbresource.ID{ @@ -34,7 +33,6 @@ func createNodeHealthStatusResource(t *testing.T, data protoreflect.ProtoMessage Type: pbcatalog.NodeHealthStatusType, Tenancy: &pbresource.Tenancy{ Partition: "default", - PeerName: "local", }, Name: "test-status", }, diff --git a/internal/catalog/internal/types/node_test.go b/internal/catalog/internal/types/node_test.go index 5a678745e3..53e4505275 100644 --- a/internal/catalog/internal/types/node_test.go +++ b/internal/catalog/internal/types/node_test.go @@ -23,7 +23,6 @@ func createNodeResource(t *testing.T, data protoreflect.ProtoMessage) *pbresourc Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "test-node", }, diff --git a/internal/catalog/internal/types/service_endpoints_test.go b/internal/catalog/internal/types/service_endpoints_test.go index 0edb249e90..a1c7020e28 100644 --- a/internal/catalog/internal/types/service_endpoints_test.go +++ b/internal/catalog/internal/types/service_endpoints_test.go @@ -18,13 +18,11 @@ var ( defaultEndpointTenancy = &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", } badEndpointTenancy = &pbresource.Tenancy{ Partition: "default", Namespace: "bad", - PeerName: "local", } ) diff --git a/internal/catalog/internal/types/service_test.go b/internal/catalog/internal/types/service_test.go index 18649dda9a..87d1c588a4 100644 --- a/internal/catalog/internal/types/service_test.go +++ b/internal/catalog/internal/types/service_test.go @@ -24,7 +24,6 @@ func createServiceResource(t *testing.T, data protoreflect.ProtoMessage) *pbreso Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "test-policy", }, diff --git a/internal/catalog/internal/types/validators.go b/internal/catalog/internal/types/validators.go index f5501a27b0..372a253157 100644 --- a/internal/catalog/internal/types/validators.go +++ b/internal/catalog/internal/types/validators.go @@ -13,7 +13,6 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "google.golang.org/protobuf/proto" "github.com/hashicorp/consul/internal/resource" pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1" @@ -294,9 +293,7 @@ func validateDNSPolicy(policy *pbcatalog.DNSPolicy) error { } func validateReferenceType(allowed *pbresource.Type, check *pbresource.Type) error { - if allowed.Group == check.Group && - allowed.GroupVersion == check.GroupVersion && - allowed.Kind == check.Kind { + if resource.EqualType(allowed, check) { return nil } @@ -306,7 +303,7 @@ func validateReferenceType(allowed *pbresource.Type, check *pbresource.Type) err } func validateReferenceTenancy(allowed *pbresource.Tenancy, check *pbresource.Tenancy) error { - if proto.Equal(allowed, check) { + if resource.EqualTenancy(allowed, check) { return nil } @@ -400,15 +397,7 @@ func ValidateLocalServiceRefNoSection(ref *pbresource.Reference, wrapErr func(er }, })) } - if ref.Tenancy.PeerName != "local" { - merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{ - Name: "tenancy", - Wrapped: resource.ErrInvalidField{ - Name: "peer_name", - Wrapped: errors.New(`must be set to "local"`), - }, - })) - } + // TODO(peering/v2): Add validation that local references don't specify another peer } if ref.Name == "" { diff --git a/internal/catalog/internal/types/validators_test.go b/internal/catalog/internal/types/validators_test.go index 55405c4e55..cc477a1f44 100644 --- a/internal/catalog/internal/types/validators_test.go +++ b/internal/catalog/internal/types/validators_test.go @@ -749,7 +749,6 @@ func TestValidateReferenceTenancy(t *testing.T) { allowedTenancy := &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", } type testCase struct { @@ -766,23 +765,13 @@ func TestValidateReferenceTenancy(t *testing.T) { check: &pbresource.Tenancy{ Partition: "food", Namespace: "default", - PeerName: "local", }, err: true, }, - "group-version-mismatch": { + "namespace-mismatch": { check: &pbresource.Tenancy{ Partition: "default", Namespace: "v2", - PeerName: "local", - }, - err: true, - }, - "kind-mismatch": { - check: &pbresource.Tenancy{ - Partition: "default", - Namespace: "default", - PeerName: "Baz", }, err: true, }, @@ -804,7 +793,6 @@ func TestValidateReference(t *testing.T) { allowedTenancy := &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", } allowedType := pbcatalog.WorkloadType @@ -836,7 +824,6 @@ func TestValidateReference(t *testing.T) { Tenancy: &pbresource.Tenancy{ Partition: "foo", Namespace: "bar", - PeerName: "baz", }, Name: "foo", }, diff --git a/internal/catalog/internal/types/virtual_ips_test.go b/internal/catalog/internal/types/virtual_ips_test.go index 0107e1cfd9..3c5f80737f 100644 --- a/internal/catalog/internal/types/virtual_ips_test.go +++ b/internal/catalog/internal/types/virtual_ips_test.go @@ -23,7 +23,6 @@ func createVirtualIPsResource(t *testing.T, data protoreflect.ProtoMessage) *pbr Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "test-vip", }, diff --git a/internal/catalog/internal/types/workload_test.go b/internal/catalog/internal/types/workload_test.go index 4ea49f5b1a..898f00963f 100644 --- a/internal/catalog/internal/types/workload_test.go +++ b/internal/catalog/internal/types/workload_test.go @@ -23,7 +23,6 @@ func createWorkloadResource(t *testing.T, data protoreflect.ProtoMessage) *pbres Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "api-1234", }, diff --git a/internal/catalog/workloadselector/index_test.go b/internal/catalog/workloadselector/index_test.go index ec61c69eb7..288225ed5c 100644 --- a/internal/catalog/workloadselector/index_test.go +++ b/internal/catalog/workloadselector/index_test.go @@ -36,7 +36,6 @@ func TestServiceWorkloadIndexer(t *testing.T) { WithTenancy(&pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }). Build() @@ -56,7 +55,6 @@ func TestServiceWorkloadIndexer(t *testing.T) { WithTenancy(&pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }). Build() @@ -66,7 +64,6 @@ func TestServiceWorkloadIndexer(t *testing.T) { WithTenancy(&pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }). Reference("") @@ -74,7 +71,6 @@ func TestServiceWorkloadIndexer(t *testing.T) { WithTenancy(&pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }). Reference("") diff --git a/internal/controller/controller.go b/internal/controller/controller.go index 56a1392433..4515b5d686 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -302,9 +302,8 @@ type Request struct { // used to de-duplicate requests in the queue. func (r Request) Key() string { return fmt.Sprintf( - "part=%q,peer=%q,ns=%q,name=%q,uid=%q", + "part=%q,ns=%q,name=%q,uid=%q", r.ID.Tenancy.Partition, - r.ID.Tenancy.PeerName, r.ID.Tenancy.Namespace, r.ID.Name, r.ID.Uid, diff --git a/internal/controller/dependency/simple_test.go b/internal/controller/dependency/simple_test.go index b17b1fab8a..c5c260d4a1 100644 --- a/internal/controller/dependency/simple_test.go +++ b/internal/controller/dependency/simple_test.go @@ -24,7 +24,6 @@ func resourceID(group string, version string, kind string, name string) *pbresou Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: name, } @@ -111,7 +110,6 @@ func TestReplaceType(t *testing.T) { tenant := &pbresource.Tenancy{ Partition: "not", Namespace: "using", - PeerName: "the-defaults", } in := &pbresource.Resource{ diff --git a/internal/controller/mem_consistency_test.go b/internal/controller/mem_consistency_test.go index 61e776e82e..978b412bf7 100644 --- a/internal/controller/mem_consistency_test.go +++ b/internal/controller/mem_consistency_test.go @@ -215,7 +215,6 @@ func TestControllerRuntimeMemoryCloning(t *testing.T) { Type: fakeV2Type, Tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, }). @@ -229,7 +228,6 @@ func TestControllerRuntimeMemoryCloning(t *testing.T) { Type: fakeType, Tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, }). @@ -308,7 +306,6 @@ func TestControllerRunnerSharedMemoryCache(t *testing.T) { Type: fakeV2Type, Tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, }). diff --git a/internal/controller/runner.go b/internal/controller/runner.go index 5a761689d0..884344da51 100644 --- a/internal/controller/runner.go +++ b/internal/controller/runner.go @@ -158,7 +158,6 @@ func (c *controllerRunner) watch(ctx context.Context, typ *pbresource.Type, add Type: typ, Tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, }) @@ -333,10 +332,9 @@ type mapperRequest struct{ res *pbresource.Resource } // used to de-duplicate requests in the queue. func (i mapperRequest) Key() string { return fmt.Sprintf( - "type=%q,part=%q,peer=%q,ns=%q,name=%q,uid=%q", + "type=%q,part=%q,ns=%q,name=%q,uid=%q", resource.ToGVK(i.res.Id.Type), i.res.Id.Tenancy.Partition, - i.res.Id.Tenancy.PeerName, i.res.Id.Tenancy.Namespace, i.res.Id.Name, i.res.Id.Uid, diff --git a/internal/mesh/internal/controllers/routes/controller_test.go b/internal/mesh/internal/controllers/routes/controller_test.go index 908f2ac8e0..9ebd446813 100644 --- a/internal/mesh/internal/controllers/routes/controller_test.go +++ b/internal/mesh/internal/controllers/routes/controller_test.go @@ -1418,5 +1418,5 @@ func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) str } func backendName(name, port string, tenancy *pbresource.Tenancy) string { - return fmt.Sprintf("catalog.v2beta1.Service/%s.local.%s/%s?port=%s", tenancy.Partition, tenancy.Namespace, name, port) + return fmt.Sprintf("catalog.v2beta1.Service/%s.%s/%s?port=%s", tenancy.Partition, tenancy.Namespace, name, port) } diff --git a/internal/mesh/internal/controllers/routes/generate_test.go b/internal/mesh/internal/controllers/routes/generate_test.go index fc2d913f83..11c7dee04e 100644 --- a/internal/mesh/internal/controllers/routes/generate_test.go +++ b/internal/mesh/internal/controllers/routes/generate_test.go @@ -105,7 +105,7 @@ func TestGenerateComputedRoutes(t *testing.T) { } backendName := func(name, port string) string { - return fmt.Sprintf("catalog.v2beta1.Service/%s.local.%s/%s?port=%s", tenancy.Partition, tenancy.Namespace, name, port) + return fmt.Sprintf("catalog.v2beta1.Service/%s.%s/%s?port=%s", tenancy.Partition, tenancy.Namespace, name, port) } var ( diff --git a/internal/mesh/internal/controllers/routes/sort_rules_test.go b/internal/mesh/internal/controllers/routes/sort_rules_test.go index 50504f09cf..e079ab2b2e 100644 --- a/internal/mesh/internal/controllers/routes/sort_rules_test.go +++ b/internal/mesh/internal/controllers/routes/sort_rules_test.go @@ -484,7 +484,6 @@ func nsTenancy(ns string) *pbresource.Tenancy { return &pbresource.Tenancy{ Partition: "default", Namespace: ns, - PeerName: "local", } } diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go b/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go index 459c68666b..aabfe90543 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go @@ -66,10 +66,12 @@ func (b *Builder) Build() *pbmesh.ProxyStateTemplate { Partition: b.id.Tenancy.Partition, } - b.proxyStateTemplate.RequiredTrustBundles[b.id.Tenancy.PeerName] = &pbproxystate.TrustBundleRef{ - Peer: b.id.Tenancy.PeerName, + b.proxyStateTemplate.RequiredTrustBundles[resource.DefaultPeerName] = &pbproxystate.TrustBundleRef{ + Peer: resource.DefaultPeerName, } + // TODO(peering/v2) add trust bundle refs for all peered upstreams + finalCleanupOfProxyStateTemplate(b.proxyStateTemplate) return b.proxyStateTemplate diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go index 78d7b2cc01..733cb8ace3 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go @@ -17,6 +17,7 @@ import ( "github.com/hashicorp/consul/internal/mesh/internal/types" "github.com/hashicorp/consul/internal/mesh/internal/types/intermediate" "github.com/hashicorp/consul/internal/protoutil" + "github.com/hashicorp/consul/internal/resource" pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1" pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1" "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate" @@ -681,7 +682,7 @@ func (b *Builder) newClusterEndpointGroup( IdentityKey: b.proxyStateTemplate.ProxyState.Identity.Name, ValidationContext: &pbproxystate.MeshOutboundValidationContext{ SpiffeIds: spiffeIDs, - TrustBundlePeerNameKey: b.id.Tenancy.PeerName, + TrustBundlePeerNameKey: resource.DefaultPeerName, }, Sni: sni, }, diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go index 5ae549a4dd..50fb989990 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go @@ -8,12 +8,12 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" - pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1" - "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/envoyextensions/xdscommon" + "github.com/hashicorp/consul/internal/resource" pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1" pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1" + pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1" "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate" ) @@ -525,7 +525,7 @@ func (l *ListenerBuilder) addInboundTLS() *ListenerBuilder { InboundMesh: &pbproxystate.InboundMeshMTLS{ IdentityKey: workloadIdentity, ValidationContext: &pbproxystate.MeshInboundValidationContext{ - TrustBundlePeerNameKeys: []string{l.builder.id.Tenancy.PeerName}, + TrustBundlePeerNameKeys: []string{resource.DefaultPeerName}, }, }, }, diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go b/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go index 13a21e4e59..5d3b5928d1 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go @@ -40,7 +40,10 @@ func DestinationListenerName(destinationRef *pbresource.Reference, portName stri // DestinationResourceID returns a string representation that uniquely identifies the // upstream in a canonical but human readable way. func DestinationResourceID(destinationRef *pbresource.Reference, port string) string { - tenancyPrefix := fmt.Sprintf("%s/%s/%s", destinationRef.Tenancy.Partition, - destinationRef.Tenancy.PeerName, destinationRef.Tenancy.Namespace) - return fmt.Sprintf("%s/%s:%s", tenancyPrefix, destinationRef.Name, port) + return fmt.Sprintf("%s/%s/%s:%s", + destinationRef.Tenancy.Partition, + destinationRef.Tenancy.Namespace, + destinationRef.Name, + port, + ) } diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden index bea728a5c8..c9b13b5a87 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "default/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -151,8 +150,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -168,8 +166,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -193,4 +190,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden index 6a29a2b770..8593ab95da 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -151,8 +150,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -168,8 +166,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -193,4 +190,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-bar.golden index e08280a69e..dbc581917b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-bar.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "foo/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -151,8 +150,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -168,8 +166,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -193,4 +190,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden index 08673123e7..bb60a41cbd 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/default/api-1:tcp:1.1.1.1:1234", + "name": "foo/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -151,8 +150,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -168,8 +166,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -193,4 +190,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden index 21ff927a41..4d4e222743 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden @@ -129,8 +129,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -145,7 +144,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "default/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -172,7 +171,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/bar/api-2:tcp:/path/to/socket", + "name": "default/bar/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -194,7 +193,7 @@ "host": "1.1.1.1", "port": 2345 }, - "name": "default/local/bar/api-1:tcp2:1.1.1.1:2345", + "name": "default/bar/api-1:tcp2:1.1.1.1:2345", "routers": [ { "l4": { @@ -221,7 +220,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/bar/api-2:tcp2:/path/to/socket", + "name": "default/bar/api-2:tcp2:/path/to/socket", "routers": [ { "l4": { @@ -245,8 +244,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -262,8 +260,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -279,8 +276,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -296,8 +292,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -321,4 +316,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-default.golden index 66cb0d3673..9d9c54a322 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-default.golden @@ -129,8 +129,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -145,7 +144,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -172,7 +171,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp:/path/to/socket", + "name": "default/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -194,7 +193,7 @@ "host": "1.1.1.1", "port": 2345 }, - "name": "default/local/default/api-1:tcp2:1.1.1.1:2345", + "name": "default/default/api-1:tcp2:1.1.1.1:2345", "routers": [ { "l4": { @@ -221,7 +220,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp2:/path/to/socket", + "name": "default/default/api-2:tcp2:/path/to/socket", "routers": [ { "l4": { @@ -245,8 +244,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -262,8 +260,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -279,8 +276,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -296,8 +292,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -321,4 +316,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-bar.golden index 5a5cf2f512..6022a5b3bf 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-bar.golden @@ -129,8 +129,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -145,7 +144,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "foo/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -172,7 +171,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/bar/api-2:tcp:/path/to/socket", + "name": "foo/bar/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -194,7 +193,7 @@ "host": "1.1.1.1", "port": 2345 }, - "name": "foo/local/bar/api-1:tcp2:1.1.1.1:2345", + "name": "foo/bar/api-1:tcp2:1.1.1.1:2345", "routers": [ { "l4": { @@ -221,7 +220,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/bar/api-2:tcp2:/path/to/socket", + "name": "foo/bar/api-2:tcp2:/path/to/socket", "routers": [ { "l4": { @@ -245,8 +244,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -262,8 +260,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -279,8 +276,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -296,8 +292,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -321,4 +316,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden index c783f1a5b7..23e6c1ca94 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden @@ -129,8 +129,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -145,7 +144,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/default/api-1:tcp:1.1.1.1:1234", + "name": "foo/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -172,7 +171,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/default/api-2:tcp:/path/to/socket", + "name": "foo/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -194,7 +193,7 @@ "host": "1.1.1.1", "port": 2345 }, - "name": "foo/local/default/api-1:tcp2:1.1.1.1:2345", + "name": "foo/default/api-1:tcp2:1.1.1.1:2345", "routers": [ { "l4": { @@ -221,7 +220,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/default/api-2:tcp2:/path/to/socket", + "name": "foo/default/api-2:tcp2:/path/to/socket", "routers": [ { "l4": { @@ -245,8 +244,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -262,8 +260,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -279,8 +276,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -296,8 +292,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -321,4 +316,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-bar.golden index d971a1937c..65ad962cf9 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-bar.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -150,8 +149,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -167,8 +165,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -192,4 +189,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden index 98e24a7f2b..d84ae6fe13 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -150,8 +149,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -167,8 +165,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -192,4 +189,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-bar.golden index db1b8df66b..c5d3da996d 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-bar.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -150,8 +149,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -167,8 +165,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -192,4 +189,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-default.golden index 3fd69f75ed..f0de5d85da 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-default.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -150,8 +149,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -167,8 +165,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -192,4 +189,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-bar.golden index 3fa9cac799..4ad46e19f0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-bar.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "default/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -122,8 +121,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -139,8 +137,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -164,4 +161,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden index 42e0a274b7..0581e52f2c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -122,8 +121,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -139,8 +137,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -164,4 +161,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-bar.golden index ea2a09afda..e3c079f642 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-bar.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "foo/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -122,8 +121,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -139,8 +137,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -164,4 +161,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-default.golden index 8952bf6585..9d827ca078 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-default.golden @@ -73,8 +73,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -89,7 +88,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/default/api-1:tcp:1.1.1.1:1234", + "name": "foo/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -122,8 +121,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -139,8 +137,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -164,4 +161,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-bar.golden index 0c1ade0457..5eedd0db1f 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-bar.golden @@ -34,8 +34,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -46,7 +45,7 @@ "listeners": [ { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/bar/api-2:tcp:/path/to/socket", + "name": "default/bar/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -70,8 +69,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -95,4 +93,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden index 0152a0ef43..b31441f849 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden @@ -34,8 +34,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -46,7 +45,7 @@ "listeners": [ { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp:/path/to/socket", + "name": "default/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -70,8 +69,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -95,4 +93,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-bar.golden index fd408ca191..f245319eec 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-bar.golden @@ -34,8 +34,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -46,7 +45,7 @@ "listeners": [ { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/bar/api-2:tcp:/path/to/socket", + "name": "foo/bar/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -70,8 +69,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -95,4 +93,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-default.golden index c4343f83f5..21d7f34d06 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-default.golden @@ -34,8 +34,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -46,7 +45,7 @@ "listeners": [ { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/default/api-2:tcp:/path/to/socket", + "name": "foo/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -70,8 +69,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -95,4 +93,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-bar.golden index 0b52b56f59..ba1a143e13 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-bar.golden @@ -45,8 +45,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -101,8 +100,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -126,4 +124,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden index 7bb94f9370..139040d1c1 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden @@ -45,8 +45,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -101,8 +100,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -126,4 +124,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-bar.golden index 142a33e2e6..2c2e96577c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-bar.golden @@ -45,8 +45,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -101,8 +100,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -126,4 +124,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-default.golden index f9c714de6f..1e8931cd21 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-default.golden @@ -45,8 +45,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -101,8 +100,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -126,4 +124,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden index 72b9e2771a..209fe04ef6 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden @@ -162,8 +162,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -178,7 +177,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "default/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -205,7 +204,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/bar/api-2:tcp:/path/to/socket", + "name": "default/bar/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -227,12 +226,12 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/bar/api-1:http:1.1.1.1:1234", + "name": "default/bar/api-1:http:1.1.1.1:1234", "routers": [ { "l7": { "route": { - "name": "default/local/bar/api-1:http:1.1.1.1:1234" + "name": "default/bar/api-1:http:1.1.1.1:1234" }, "statPrefix": "upstream.http.api-1.bar.default.dc1" } @@ -241,13 +240,13 @@ } ], "routes": { - "default/local/bar/api-1:http:1.1.1.1:1234": { + "default/bar/api-1:http:1.1.1.1:1234": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/bar/api-1:http:1.1.1.1:1234", + "name": "default/bar/api-1:http:1.1.1.1:1234", "routeRules": [ { "destination": { @@ -324,8 +323,7 @@ "name": "backup-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -341,8 +339,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -358,8 +355,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -375,8 +371,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -392,8 +387,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -417,4 +411,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-default.golden index d591702732..fe6bcec794 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-default.golden @@ -162,8 +162,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -178,7 +177,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -205,7 +204,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp:/path/to/socket", + "name": "default/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -227,12 +226,12 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:http:1.1.1.1:1234", + "name": "default/default/api-1:http:1.1.1.1:1234", "routers": [ { "l7": { "route": { - "name": "default/local/default/api-1:http:1.1.1.1:1234" + "name": "default/default/api-1:http:1.1.1.1:1234" }, "statPrefix": "upstream.http.api-1.default.default.dc1" } @@ -241,13 +240,13 @@ } ], "routes": { - "default/local/default/api-1:http:1.1.1.1:1234": { + "default/default/api-1:http:1.1.1.1:1234": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-1:http:1.1.1.1:1234", + "name": "default/default/api-1:http:1.1.1.1:1234", "routeRules": [ { "destination": { @@ -324,8 +323,7 @@ "name": "backup-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -341,8 +339,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -358,8 +355,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -375,8 +371,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -392,8 +387,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -417,4 +411,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-bar.golden index f73071bf25..c7219d2641 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-bar.golden @@ -162,8 +162,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -178,7 +177,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234", + "name": "foo/bar/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -205,7 +204,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/bar/api-2:tcp:/path/to/socket", + "name": "foo/bar/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -227,12 +226,12 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/bar/api-1:http:1.1.1.1:1234", + "name": "foo/bar/api-1:http:1.1.1.1:1234", "routers": [ { "l7": { "route": { - "name": "foo/local/bar/api-1:http:1.1.1.1:1234" + "name": "foo/bar/api-1:http:1.1.1.1:1234" }, "statPrefix": "upstream.http.api-1.bar.foo.dc1" } @@ -241,13 +240,13 @@ } ], "routes": { - "foo/local/bar/api-1:http:1.1.1.1:1234": { + "foo/bar/api-1:http:1.1.1.1:1234": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/bar/api-1:http:1.1.1.1:1234", + "name": "foo/bar/api-1:http:1.1.1.1:1234", "routeRules": [ { "destination": { @@ -324,8 +323,7 @@ "name": "backup-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -341,8 +339,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -358,8 +355,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -375,8 +371,7 @@ "name": "api-1", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -392,8 +387,7 @@ "name": "api-2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -417,4 +411,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden index 0819114fad..ef938d778f 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden @@ -162,8 +162,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -178,7 +177,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/default/api-1:tcp:1.1.1.1:1234", + "name": "foo/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -205,7 +204,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "foo/local/default/api-2:tcp:/path/to/socket", + "name": "foo/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -227,12 +226,12 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "foo/local/default/api-1:http:1.1.1.1:1234", + "name": "foo/default/api-1:http:1.1.1.1:1234", "routers": [ { "l7": { "route": { - "name": "foo/local/default/api-1:http:1.1.1.1:1234" + "name": "foo/default/api-1:http:1.1.1.1:1234" }, "statPrefix": "upstream.http.api-1.default.foo.dc1" } @@ -241,13 +240,13 @@ } ], "routes": { - "foo/local/default/api-1:http:1.1.1.1:1234": { + "foo/default/api-1:http:1.1.1.1:1234": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/default/api-1:http:1.1.1.1:1234", + "name": "foo/default/api-1:http:1.1.1.1:1234", "routeRules": [ { "destination": { @@ -324,8 +323,7 @@ "name": "backup-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -341,8 +339,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -358,8 +355,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -375,8 +371,7 @@ "name": "api-1", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -392,8 +387,7 @@ "name": "api-2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -417,4 +411,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden index b72541c9e3..4cc507095a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden @@ -185,8 +185,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -255,7 +254,7 @@ { "l7": { "route": { - "name": "default/local/bar/api-app:http" + "name": "default/bar/api-app:http" }, "statPrefix": "upstream.http.api-app.bar.default.dc1" }, @@ -272,7 +271,7 @@ { "l7": { "route": { - "name": "default/local/bar/api-app2:http" + "name": "default/bar/api-app2:http" }, "statPrefix": "upstream.http.api-app2.bar.default.dc1" }, @@ -332,13 +331,13 @@ } ], "routes": { - "default/local/bar/api-app2:http": { + "default/bar/api-app2:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/bar/api-app2:http", + "name": "default/bar/api-app2:http", "routeRules": [ { "destination": { @@ -356,13 +355,13 @@ } ] }, - "default/local/bar/api-app:http": { + "default/bar/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/bar/api-app:http", + "name": "default/bar/api-app:http", "routeRules": [ { "destination": { @@ -388,8 +387,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -405,8 +403,7 @@ "name": "api-app2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -422,8 +419,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -439,8 +435,7 @@ "name": "api-app2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -456,8 +451,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -473,8 +467,7 @@ "name": "api-app2", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -498,4 +491,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index 2a0ce985c6..fb71b7caba 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -185,8 +185,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -255,7 +254,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app:http" + "name": "default/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.default.dc1" }, @@ -272,7 +271,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app2:http" + "name": "default/default/api-app2:http" }, "statPrefix": "upstream.http.api-app2.default.default.dc1" }, @@ -332,13 +331,13 @@ } ], "routes": { - "default/local/default/api-app2:http": { + "default/default/api-app2:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app2:http", + "name": "default/default/api-app2:http", "routeRules": [ { "destination": { @@ -356,13 +355,13 @@ } ] }, - "default/local/default/api-app:http": { + "default/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app:http", + "name": "default/default/api-app:http", "routeRules": [ { "destination": { @@ -388,8 +387,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -405,8 +403,7 @@ "name": "api-app2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -422,8 +419,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -439,8 +435,7 @@ "name": "api-app2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -456,8 +451,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -473,8 +467,7 @@ "name": "api-app2", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -498,4 +491,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden index 3cee187d87..fb51df48af 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden @@ -185,8 +185,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -255,7 +254,7 @@ { "l7": { "route": { - "name": "foo/local/bar/api-app:http" + "name": "foo/bar/api-app:http" }, "statPrefix": "upstream.http.api-app.bar.foo.dc1" }, @@ -272,7 +271,7 @@ { "l7": { "route": { - "name": "foo/local/bar/api-app2:http" + "name": "foo/bar/api-app2:http" }, "statPrefix": "upstream.http.api-app2.bar.foo.dc1" }, @@ -332,13 +331,13 @@ } ], "routes": { - "foo/local/bar/api-app2:http": { + "foo/bar/api-app2:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/bar/api-app2:http", + "name": "foo/bar/api-app2:http", "routeRules": [ { "destination": { @@ -356,13 +355,13 @@ } ] }, - "foo/local/bar/api-app:http": { + "foo/bar/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/bar/api-app:http", + "name": "foo/bar/api-app:http", "routeRules": [ { "destination": { @@ -388,8 +387,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -405,8 +403,7 @@ "name": "api-app2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -422,8 +419,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -439,8 +435,7 @@ "name": "api-app2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -456,8 +451,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -473,8 +467,7 @@ "name": "api-app2", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -498,4 +491,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden index 271958eb04..407fd02a34 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden @@ -185,8 +185,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -255,7 +254,7 @@ { "l7": { "route": { - "name": "foo/local/default/api-app:http" + "name": "foo/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.foo.dc1" }, @@ -272,7 +271,7 @@ { "l7": { "route": { - "name": "foo/local/default/api-app2:http" + "name": "foo/default/api-app2:http" }, "statPrefix": "upstream.http.api-app2.default.foo.dc1" }, @@ -332,13 +331,13 @@ } ], "routes": { - "foo/local/default/api-app2:http": { + "foo/default/api-app2:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/default/api-app2:http", + "name": "foo/default/api-app2:http", "routeRules": [ { "destination": { @@ -356,13 +355,13 @@ } ] }, - "foo/local/default/api-app:http": { + "foo/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/default/api-app:http", + "name": "foo/default/api-app:http", "routeRules": [ { "destination": { @@ -388,8 +387,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -405,8 +403,7 @@ "name": "api-app2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -422,8 +419,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -439,8 +435,7 @@ "name": "api-app2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -456,8 +451,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -473,8 +467,7 @@ "name": "api-app2", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -498,4 +491,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden index eb18deb9e3..2855ab8ee0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "default/local/bar/api-app:http" + "name": "default/bar/api-app:http" }, "statPrefix": "upstream.http.api-app.bar.default.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "default/local/bar/api-app:http": { + "default/bar/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/bar/api-app:http", + "name": "default/bar/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index 39a78a9bcd..0b7c52861b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app:http" + "name": "default/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.default.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "default/local/default/api-app:http": { + "default/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app:http", + "name": "default/default/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden index 20998f72fe..75453fa90a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "foo/local/bar/api-app:http" + "name": "foo/bar/api-app:http" }, "statPrefix": "upstream.http.api-app.bar.foo.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "foo/local/bar/api-app:http": { + "foo/bar/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/bar/api-app:http", + "name": "foo/bar/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden index a92a226e09..71416b2508 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "foo/local/default/api-app:http" + "name": "foo/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.foo.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "foo/local/default/api-app:http": { + "foo/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/default/api-app:http", + "name": "foo/default/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden index eb18deb9e3..2855ab8ee0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "default/local/bar/api-app:http" + "name": "default/bar/api-app:http" }, "statPrefix": "upstream.http.api-app.bar.default.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "default/local/bar/api-app:http": { + "default/bar/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/bar/api-app:http", + "name": "default/bar/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index 39a78a9bcd..0b7c52861b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app:http" + "name": "default/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.default.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "default/local/default/api-app:http": { + "default/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app:http", + "name": "default/default/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden index 20998f72fe..75453fa90a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "foo/local/bar/api-app:http" + "name": "foo/bar/api-app:http" }, "statPrefix": "upstream.http.api-app.bar.foo.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "foo/local/bar/api-app:http": { + "foo/bar/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/bar/api-app:http", + "name": "foo/bar/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden index a92a226e09..71416b2508 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden @@ -101,8 +101,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -150,7 +149,7 @@ { "l7": { "route": { - "name": "foo/local/default/api-app:http" + "name": "foo/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.foo.dc1" }, @@ -185,13 +184,13 @@ } ], "routes": { - "foo/local/default/api-app:http": { + "foo/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "foo/local/default/api-app:http", + "name": "foo/default/api-app:http", "routeRules": [ { "destination": { @@ -217,8 +216,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -234,8 +232,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -251,8 +248,7 @@ "name": "api-app", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "catalog", @@ -276,4 +272,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden index 69a9d49fd3..3b8ea47d5b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -209,4 +208,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden index 2af5ce9c06..e217a535ce 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -209,4 +208,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-bar.golden index 4236759182..e7a1c7f75b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-bar.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -209,4 +208,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden index 769e098e2c..8dea5c5371 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -209,4 +208,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths.golden index 2af5ce9c06..e217a535ce 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -209,4 +208,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden index cd42af3843..4062fa0515 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden @@ -94,8 +94,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -301,4 +300,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden index 299b051ef6..91ba124a24 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden @@ -94,8 +94,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -301,4 +300,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-bar.golden index 401f78db44..bbb8343f5b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-bar.golden @@ -94,8 +94,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -301,4 +300,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden index 208ae29f3f..682a459818 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden @@ -94,8 +94,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -301,4 +300,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden index 299b051ef6..91ba124a24 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden @@ -94,8 +94,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -301,4 +300,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden index e9f966b463..1751086f7d 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -336,4 +335,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden index 7fbbf8485a..8370e013d0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -336,4 +335,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-bar.golden index 5dc855460b..d80dcc4803 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-bar.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -336,4 +335,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden index fd3f8dd78c..bd65e16e60 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -336,4 +335,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden index 7fbbf8485a..8370e013d0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -336,4 +335,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-bar.golden index 71727030fd..25c77f8e2a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-bar.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden index b86daa2817..b2242df82c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-bar.golden index 091b51a808..f66b53d3f7 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-bar.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden index ef874be52a..d6358f039b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden index b86daa2817..b2242df82c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-bar.golden index 94089a6f0a..2e589dc246 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden index 93a69b2bb0..1952c6d8f3 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-bar.golden index c1b2664d2e..d55d93e640 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-default.golden index af5c54fa0e..96724f2843 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden index 93a69b2bb0..1952c6d8f3 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-bar.golden index 52a3257ee7..10fe9f588d 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden index 3831349ccd..68c8567aeb 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-bar.golden index 19fe7d3a16..ba99e0eaf0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-default.golden index 8279e5ee7b..dfe7bacbc0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden index 3831349ccd..68c8567aeb 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-bar.golden index 52a3257ee7..10fe9f588d 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden index 3831349ccd..68c8567aeb 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-bar.golden index 19fe7d3a16..ba99e0eaf0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-default.golden index 8279e5ee7b..dfe7bacbc0 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden index 3831349ccd..68c8567aeb 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -127,4 +126,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-bar.golden index 913b1b8e98..b45dc50b60 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-bar.golden @@ -13,8 +13,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -58,4 +57,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden index dc9afc44fa..33dd38c3d8 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden @@ -13,8 +13,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -58,4 +57,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden index 9400538fc5..159c5e77c1 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden @@ -13,8 +13,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -58,4 +57,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-default.golden index 7e9283df7a..553939abfa 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-default.golden @@ -13,8 +13,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -58,4 +57,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden index dc9afc44fa..33dd38c3d8 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden @@ -13,8 +13,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -58,4 +57,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden index 97f406874f..d5ef6e5b3f 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -180,4 +179,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden index dcba1dc581..c966fc1340 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -180,4 +179,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden index 60bf38e8ec..872cee4a65 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -180,4 +179,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden index 4ddca8f31b..45a814d4cb 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -180,4 +179,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden index dcba1dc581..c966fc1340 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden @@ -42,8 +42,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -180,4 +179,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden index c8849428f0..0af2bfbe1c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden index 08d9faa234..991c4e6d60 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-bar.golden index d5d96889b4..ea7003c977 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-bar.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden index 89503e533e..fa649e0db3 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden index 08d9faa234..991c4e6d60 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden index c8849428f0..0af2bfbe1c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden index 08d9faa234..991c4e6d60 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-bar.golden index d5d96889b4..ea7003c977 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-bar.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden index 89503e533e..fa649e0db3 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports.golden index 08d9faa234..991c4e6d60 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports.golden @@ -59,8 +59,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -247,4 +246,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden index 71727030fd..25c77f8e2a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden index b86daa2817..b2242df82c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-bar.golden index 091b51a808..f66b53d3f7 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-bar.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-bar.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "bar", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden index ef874be52a..d6358f039b 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "foo", - "peerName": "local" + "partition": "foo" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden index b86daa2817..b2242df82c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden @@ -76,8 +76,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -288,4 +287,4 @@ "peer": "local" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/sidecarproxy/cache/cache.go b/internal/mesh/internal/controllers/sidecarproxy/cache/cache.go index b2007d5b0d..af0909739a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/cache/cache.go +++ b/internal/mesh/internal/controllers/sidecarproxy/cache/cache.go @@ -223,7 +223,6 @@ func (c *Cache) listAllProxyStateTemplatesTemporarily(ctx context.Context, rt co Tenancy: &pbresource.Tenancy{ Namespace: storage.Wildcard, Partition: tenancy.Partition, - PeerName: tenancy.PeerName, }, }) if err != nil { diff --git a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go index 3d93e70724..f5aba93c1a 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go +++ b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go @@ -173,7 +173,7 @@ func (suite *controllerTestSuite) setupSuiteWithTenancy(tenancy *pbresource.Tena IdentityName: "foo", Namespace: "default", Partition: "default", - Peer: "local", + Peer: resource.DefaultPeerName, }, }, }, diff --git a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go index 9d9ec2756e..8a1654c713 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go +++ b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go @@ -278,7 +278,6 @@ func (f *Fetcher) FetchImplicitDestinationsData( Tenancy: &pbresource.Tenancy{ Namespace: storage.Wildcard, Partition: proxyID.Tenancy.Partition, - PeerName: proxyID.Tenancy.PeerName, }, }) if err != nil { diff --git a/internal/mesh/internal/controllers/xds/controller.go b/internal/mesh/internal/controllers/xds/controller.go index e726150950..a8a0e0179b 100644 --- a/internal/mesh/internal/controllers/xds/controller.go +++ b/internal/mesh/internal/controllers/xds/controller.go @@ -138,7 +138,7 @@ func (r *xdsReconciler) Reconcile(ctx context.Context, rt controller.Runtime, re proxyStateTemplate.Template.ProxyState.TrustBundles = make(map[string]*pbproxystate.TrustBundle) } // TODO: Figure out the correct key for the default trust bundle. - proxyStateTemplate.Template.ProxyState.TrustBundles["local"] = trustBundle + proxyStateTemplate.Template.ProxyState.TrustBundles[resource.DefaultPeerName] = trustBundle if proxyStateTemplate.Template.ProxyState.Endpoints == nil { proxyStateTemplate.Template.ProxyState.Endpoints = make(map[string]*pbproxystate.Endpoints) diff --git a/internal/mesh/internal/controllers/xds/controller_test.go b/internal/mesh/internal/controllers/xds/controller_test.go index 3697bb5c73..24c2a43324 100644 --- a/internal/mesh/internal/controllers/xds/controller_test.go +++ b/internal/mesh/internal/controllers/xds/controller_test.go @@ -825,7 +825,7 @@ func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences(te } expectedTrustBundle := map[string]*pbproxystate.TrustBundle{ - "local": { + resource.DefaultPeerName: { TrustDomain: "some-trust-domain", Roots: []string{"some-root", "some-other-root"}, }, diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden index dd42531205..ea7db2f99e 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden @@ -96,8 +96,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -118,7 +117,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/l4-multi-destination-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/l4-multi-destination-default-default.golden index 70448ca450..2be942678c 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/l4-multi-destination-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/l4-multi-destination-default-default.golden @@ -174,8 +174,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -196,7 +195,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -223,7 +222,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp:/path/to/socket", + "name": "default/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -245,7 +244,7 @@ "host": "1.1.1.1", "port": 2345 }, - "name": "default/local/default/api-1:tcp2:1.1.1.1:2345", + "name": "default/default/api-1:tcp2:1.1.1.1:2345", "routers": [ { "l4": { @@ -272,7 +271,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp2:/path/to/socket", + "name": "default/default/api-2:tcp2:/path/to/socket", "routers": [ { "l4": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden index 24c917a4d3..0a9baab9eb 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden @@ -96,8 +96,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden index d3657463fd..79d6cb154b 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden @@ -96,8 +96,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -118,7 +117,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden index 19ca75501d..793a39a38b 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden @@ -46,8 +46,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -64,7 +63,7 @@ "listeners": [ { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp:/path/to/socket", + "name": "default/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden index 780d2a6f49..af1459ad1e 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden @@ -57,8 +57,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination-default-default.golden index 3acd9869e5..a936c3b655 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination-default-default.golden @@ -207,8 +207,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -229,7 +228,7 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:tcp:1.1.1.1:1234", + "name": "default/default/api-1:tcp:1.1.1.1:1234", "routers": [ { "l4": { @@ -256,7 +255,7 @@ }, { "direction": "DIRECTION_OUTBOUND", - "name": "default/local/default/api-2:tcp:/path/to/socket", + "name": "default/default/api-2:tcp:/path/to/socket", "routers": [ { "l4": { @@ -278,12 +277,12 @@ "host": "1.1.1.1", "port": 1234 }, - "name": "default/local/default/api-1:http:1.1.1.1:1234", + "name": "default/default/api-1:http:1.1.1.1:1234", "routers": [ { "l7": { "route": { - "name": "default/local/default/api-1:http:1.1.1.1:1234" + "name": "default/default/api-1:http:1.1.1.1:1234" }, "statPrefix": "upstream.http.api-1.default.default.dc1" } @@ -292,13 +291,13 @@ } ], "routes": { - "default/local/default/api-1:http:1.1.1.1:1234": { + "default/default/api-1:http:1.1.1.1:1234": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-1:http:1.1.1.1:1234", + "name": "default/default/api-1:http:1.1.1.1:1234", "routeRules": [ { "destination": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index 0158f07aa2..95d48d1da2 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -252,8 +252,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -328,7 +327,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app:http" + "name": "default/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.default.dc1" }, @@ -345,7 +344,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app2:http" + "name": "default/default/api-app2:http" }, "statPrefix": "upstream.http.api-app2.default.default.dc1" }, @@ -405,13 +404,13 @@ } ], "routes": { - "default/local/default/api-app2:http": { + "default/default/api-app2:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app2:http", + "name": "default/default/api-app2:http", "routeRules": [ { "destination": { @@ -429,13 +428,13 @@ } ] }, - "default/local/default/api-app:http": { + "default/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app:http", + "name": "default/default/api-app:http", "routeRules": [ { "destination": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index 3c9d62fb4e..6918def983 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -135,8 +135,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -190,7 +189,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app:http" + "name": "default/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.default.dc1" }, @@ -225,13 +224,13 @@ } ], "routes": { - "default/local/default/api-app:http": { + "default/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app:http", + "name": "default/default/api-app:http", "routeRules": [ { "destination": { diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index 3c9d62fb4e..6918def983 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -135,8 +135,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -190,7 +189,7 @@ { "l7": { "route": { - "name": "default/local/default/api-app:http" + "name": "default/default/api-app:http" }, "statPrefix": "upstream.http.api-app.default.default.dc1" }, @@ -225,13 +224,13 @@ } ], "routes": { - "default/local/default/api-app:http": { + "default/default/api-app:http": { "virtualHosts": [ { "domains": [ "*" ], - "name": "default/local/default/api-app:http", + "name": "default/default/api-app:http", "routeRules": [ { "destination": { diff --git a/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths-default-default.golden index 994b00f415..09755d140c 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths-default-default.golden @@ -58,8 +58,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths.golden b/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths.golden index 994b00f415..d9c54815a9 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/l7-expose-paths.golden @@ -58,8 +58,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -210,4 +209,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections-default-default.golden index f75354038b..d6397258e4 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections-default-default.golden @@ -93,8 +93,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections.golden b/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections.golden index f75354038b..558cb82987 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/local-and-inbound-connections.golden @@ -93,8 +93,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -302,4 +301,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden index fc5f812a6e..767c934280 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden @@ -75,8 +75,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden index fc5f812a6e..523cc14e6b 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden @@ -75,8 +75,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -337,4 +336,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports-default-default.golden index 8b04918948..66677144f1 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports-default-default.golden @@ -75,8 +75,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden index 8b04918948..3eb510bfab 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden @@ -75,8 +75,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -289,4 +288,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden index e2798c8d4e..5471a1b1e9 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -41,8 +41,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden index e2798c8d4e..03d200eebf 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden @@ -41,8 +41,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -128,4 +127,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden index 21402c187b..9406203531 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden @@ -41,8 +41,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden index 21402c187b..f75b168848 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden @@ -41,8 +41,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -128,4 +127,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-single-workload-address-without-ports.golden index 1487da2133..47fbf827ec 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-single-workload-address-without-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-single-workload-address-without-ports.golden @@ -39,8 +39,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -126,4 +125,4 @@ "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden index 92f491e9e0..d65f83f49b 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden @@ -12,8 +12,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port.golden index 92f491e9e0..77304937ee 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l4-workload-with-only-mesh-port.golden @@ -12,8 +12,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -59,4 +58,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden index fdab88cd7c..a6fb38882e 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden @@ -41,8 +41,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden index fdab88cd7c..25635a0ff7 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden @@ -41,8 +41,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -181,4 +180,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden index 3403eed7a8..4f37005dcf 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden @@ -58,8 +58,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden index 3403eed7a8..0aa54c761f 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-multiple-workload-addresses-without-ports.golden @@ -58,8 +58,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -248,4 +247,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-single-workload-address-without-ports.golden index 460ede9810..3f40e7b93b 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-single-workload-address-without-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/multiport-l7-single-workload-address-without-ports.golden @@ -55,8 +55,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -245,4 +244,4 @@ "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports-default-default.golden index 8b04918948..66677144f1 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports-default-default.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports-default-default.golden @@ -75,8 +75,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", diff --git a/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden index 8b04918948..3eb510bfab 100644 --- a/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden +++ b/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden @@ -75,8 +75,7 @@ "name": "test-identity", "tenancy": { "namespace": "default", - "partition": "default", - "peerName": "local" + "partition": "default" }, "type": { "group": "auth", @@ -289,4 +288,4 @@ "trustDomain": "some-trust-domain" } } -} \ No newline at end of file +} diff --git a/internal/mesh/internal/types/destinations.go b/internal/mesh/internal/types/destinations.go index 301fdbf6d7..3af589e117 100644 --- a/internal/mesh/internal/types/destinations.go +++ b/internal/mesh/internal/types/destinations.go @@ -36,11 +36,8 @@ func mutateDestinations(res *DecodedDestinations) (bool, error) { if dest.DestinationRef == nil { continue // skip; let the validation hook error out instead } - if dest.DestinationRef.Tenancy != nil && !isLocalPeer(dest.DestinationRef.Tenancy.PeerName) { - // TODO(peering/v2): remove this bypass when we know what to do with - // non-local peer references. - continue - } + + // TODO(peering/v2): handle non-local peer references here somehow orig := proto.Clone(dest.DestinationRef).(*pbresource.Reference) resource.DefaultReferenceTenancy( dest.DestinationRef, @@ -57,7 +54,7 @@ func mutateDestinations(res *DecodedDestinations) (bool, error) { } func isLocalPeer(p string) bool { - return p == "local" || p == "" + return p == resource.DefaultPeerName || p == "" } var ValidateDestinations = resource.DecodeAndValidate(validateDestinations) diff --git a/internal/mesh/internal/types/destinations_test.go b/internal/mesh/internal/types/destinations_test.go index 55624a6316..cadadfc2cb 100644 --- a/internal/mesh/internal/types/destinations_test.go +++ b/internal/mesh/internal/types/destinations_test.go @@ -202,20 +202,7 @@ func TestValidateDestinations(t *testing.T) { }, expectErr: `invalid element at index 0 of list "destinations": invalid "destination_ref" field: invalid "tenancy" field: invalid "namespace" field: cannot be empty`, }, - "dest/bad dest tenancy/peer_name": { - skipMutate: true, - data: &pbmesh.Destinations{ - Workloads: &pbcatalog.WorkloadSelector{ - Names: []string{"blah"}, - }, - Destinations: []*pbmesh.Destination{ - {DestinationRef: resourcetest.Resource(pbcatalog.ServiceType, "api"). - WithTenancy(&pbresource.Tenancy{Partition: "foo", Namespace: "bar"}). - Reference("")}, - }, - }, - expectErr: `invalid element at index 0 of list "destinations": invalid "destination_ref" field: invalid "tenancy" field: invalid "peer_name" field: must be set to "local"`, - }, + // TODO(peering/v2) add test for invalid peer in destination ref "unsupported pq_destinations": { skipMutate: true, data: &pbmesh.Destinations{ diff --git a/internal/mesh/internal/types/xroute_test.go b/internal/mesh/internal/types/xroute_test.go index 4b861909b0..eb7aee0a2b 100644 --- a/internal/mesh/internal/types/xroute_test.go +++ b/internal/mesh/internal/types/xroute_test.go @@ -176,7 +176,7 @@ func getXRouteParentRefTestCases() map[string]xRouteParentRefTestcase { newParentRef(pbcatalog.ServiceType, "", "api", "http"), newParentRef(pbcatalog.ServiceType, "", "api", "http"), }, - expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for port "http" exists twice`, + expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.default/api" for port "http" exists twice`, }, "duplicate wild parents": { routeTenancy: resource.DefaultNamespacedTenancy(), @@ -184,7 +184,7 @@ func getXRouteParentRefTestCases() map[string]xRouteParentRefTestcase { newParentRef(pbcatalog.ServiceType, "", "api", ""), newParentRef(pbcatalog.ServiceType, "", "api", ""), }, - expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for wildcard port exists twice`, + expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.default/api" for wildcard port exists twice`, }, "duplicate parents via exact+wild overlap": { routeTenancy: resource.DefaultNamespacedTenancy(), @@ -192,7 +192,7 @@ func getXRouteParentRefTestCases() map[string]xRouteParentRefTestcase { newParentRef(pbcatalog.ServiceType, "", "api", "http"), newParentRef(pbcatalog.ServiceType, "", "api", ""), }, - expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for ports [http] covered by wildcard port already`, + expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.default/api" for ports [http] covered by wildcard port already`, }, "duplicate parents via exact+wild overlap (reversed)": { routeTenancy: resource.DefaultNamespacedTenancy(), @@ -200,7 +200,7 @@ func getXRouteParentRefTestCases() map[string]xRouteParentRefTestcase { newParentRef(pbcatalog.ServiceType, "", "api", ""), newParentRef(pbcatalog.ServiceType, "", "api", "http"), }, - expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for port "http" covered by wildcard port already`, + expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.default/api" for port "http" covered by wildcard port already`, }, "good single parent ref": { routeTenancy: resource.DefaultNamespacedTenancy(), diff --git a/internal/mesh/proxy-tracker/proxy_state_exports_test.go b/internal/mesh/proxy-tracker/proxy_state_exports_test.go index 18d15fb53d..1094ca95e8 100644 --- a/internal/mesh/proxy-tracker/proxy_state_exports_test.go +++ b/internal/mesh/proxy-tracker/proxy_state_exports_test.go @@ -23,7 +23,6 @@ func TestProxyState_Authorize(t *testing.T) { Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: "test-identity", } diff --git a/internal/multicluster/internal/controllers/exportedservices/controller.go b/internal/multicluster/internal/controllers/exportedservices/controller.go index 9287fa5749..ecbfed1f63 100644 --- a/internal/multicluster/internal/controllers/exportedservices/controller.go +++ b/internal/multicluster/internal/controllers/exportedservices/controller.go @@ -60,7 +60,6 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c Tenancy: &pbresource.Tenancy{ Namespace: storage.Wildcard, Partition: req.ID.Tenancy.Partition, - PeerName: resource.DefaultPeerName, }, Type: pbmulticluster.ExportedServicesType, }) @@ -72,7 +71,6 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c Tenancy: &pbresource.Tenancy{ Namespace: storage.Wildcard, Partition: req.ID.Tenancy.Partition, - PeerName: resource.DefaultPeerName, }, Type: pbmulticluster.NamespaceExportedServicesType, }) @@ -83,7 +81,6 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c partitionedExportedServices, err := resource.ListDecodedResource[*pbmulticluster.PartitionExportedServices](ctx, rt.Client, &pbresource.ListRequest{ Tenancy: &pbresource.Tenancy{ Partition: req.ID.Tenancy.Partition, - PeerName: resource.DefaultPeerName, }, Type: pbmulticluster.PartitionExportedServicesType, }) @@ -110,7 +107,6 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c Tenancy: &pbresource.Tenancy{ Namespace: namespace, Partition: req.ID.Tenancy.Partition, - PeerName: resource.DefaultPeerName, }, Type: pbcatalog.ServiceType, }) diff --git a/internal/multicluster/internal/controllers/exportedservices/controller_test.go b/internal/multicluster/internal/controllers/exportedservices/controller_test.go index 2c23706e28..53cd76bbbd 100644 --- a/internal/multicluster/internal/controllers/exportedservices/controller_test.go +++ b/internal/multicluster/internal/controllers/exportedservices/controller_test.go @@ -488,7 +488,7 @@ func (suite *controllerSuite) TestController() { computedCES = suite.getComputedExportedSvc(res.Id) expectedComputedExportedService = constructComputedExportedServices( constructComputedExportedService( - constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), suite.constructConsumer("peer-2", "peer"), @@ -519,14 +519,14 @@ func (suite *controllerSuite) TestController() { computedCES = suite.getComputedExportedSvc(res.Id) expectedComputedExportedService = constructComputedExportedServices( constructComputedExportedService( - constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), suite.constructConsumer("peer-2", "peer"), }, ), constructComputedExportedService( - constructSvcReference("svc4", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc4", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), suite.constructConsumer("peer-2", "peer"), @@ -557,7 +557,7 @@ func (suite *controllerSuite) TestController() { computedCES = suite.getComputedExportedSvc(res.Id) expectedComputedExportedService = constructComputedExportedServices( constructComputedExportedService( - constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), suite.constructConsumer("peer-2", "peer"), @@ -589,7 +589,7 @@ func (suite *controllerSuite) TestController() { computedCES = suite.getComputedExportedSvc(res.Id) expectedComputedExportedService = constructComputedExportedServices( constructComputedExportedService( - constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), suite.constructConsumer("peer-2", "peer"), @@ -672,7 +672,7 @@ func (suite *controllerSuite) TestController() { computedCES = suite.getComputedExportedSvc(res.Id) expectedComputedExportedService = constructComputedExportedServices( constructComputedExportedService( - constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), }, @@ -685,7 +685,7 @@ func (suite *controllerSuite) TestController() { computedCES = suite.getComputedExportedSvc(res.Id) expectedComputedExportedService = constructComputedExportedServices( constructComputedExportedService( - constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app", PeerName: resource.DefaultPeerName}), + constructSvcReference("svc0", &pbresource.Tenancy{Partition: tenancy.Partition, Namespace: "app"}), []*pbmulticluster.ComputedExportedServiceConsumer{ suite.constructConsumer("peer-1", "peer"), }, diff --git a/internal/multicluster/internal/types/helpers.go b/internal/multicluster/internal/types/helpers.go index 5dac17f1e7..8c347d3da1 100644 --- a/internal/multicluster/internal/types/helpers.go +++ b/internal/multicluster/internal/types/helpers.go @@ -5,6 +5,7 @@ package types import ( "fmt" + "github.com/hashicorp/consul/internal/resource" pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" @@ -15,7 +16,7 @@ func validateExportedServiceConsumerCommon(consumer *pbmulticluster.ExportedServ switch consumer.GetConsumerTenancy().(type) { case *pbmulticluster.ExportedServicesConsumer_Peer: { - if consumer.GetPeer() == "" || consumer.GetPeer() == "local" { + if consumer.GetPeer() == "" || consumer.GetPeer() == resource.DefaultPeerName { return resource.ErrInvalidListElement{ Name: "peer", Index: indx, diff --git a/internal/resource/authz.go b/internal/resource/authz.go index 77a5d7850f..f0725d952a 100644 --- a/internal/resource/authz.go +++ b/internal/resource/authz.go @@ -5,7 +5,7 @@ package resource func peerNameV2ToV1(peer string) string { // The name of the local/default peer is different between v1 and v2. - if peer == "local" { + if peer == DefaultPeerName { return "" } return peer @@ -14,7 +14,7 @@ func peerNameV2ToV1(peer string) string { func peerNameV1ToV2(peer string) string { // The name of the local/default peer is different between v1 and v2. if peer == "" { - return "local" + return DefaultPeerName } return peer } diff --git a/internal/resource/authz_ce.go b/internal/resource/authz_ce.go index 69a1749e20..d41a1b9e89 100644 --- a/internal/resource/authz_ce.go +++ b/internal/resource/authz_ce.go @@ -12,7 +12,6 @@ import ( // AuthorizerContext builds an ACL AuthorizerContext for the given tenancy. func AuthorizerContext(t *pbresource.Tenancy) *acl.AuthorizerContext { - return &acl.AuthorizerContext{ - Peer: peerNameV2ToV1(t.PeerName), - } + // TODO(peering/v2) handle non-local peers here + return &acl.AuthorizerContext{} } diff --git a/internal/resource/authz_ce_test.go b/internal/resource/authz_ce_test.go index a2b76f86bf..9808d8d9ee 100644 --- a/internal/resource/authz_ce_test.go +++ b/internal/resource/authz_ce_test.go @@ -31,21 +31,9 @@ func TestAuthorizerContext_CE(t *testing.T) { AuthorizerContext(&pbresource.Tenancy{ Partition: "foo", Namespace: "bar", - PeerName: "local", }), ) }) - t.Run("with non-local peer", func(t *testing.T) { - require.Equal(t, - &acl.AuthorizerContext{ - Peer: "remote", - }, - AuthorizerContext(&pbresource.Tenancy{ - Partition: "foo", - Namespace: "bar", - PeerName: "remote", - }), - ) - }) + // TODO(peering/v2): add a test here for non-local peers } diff --git a/internal/resource/equality.go b/internal/resource/equality.go index 25e098b1a3..106d5a476a 100644 --- a/internal/resource/equality.go +++ b/internal/resource/equality.go @@ -31,10 +31,11 @@ func EqualTenancy(a, b *pbresource.Tenancy) bool { } return a.Partition == b.Partition && - a.PeerName == b.PeerName && a.Namespace == b.Namespace } +// TODO(peering/v2) add equality method peer tenancy + // EqualID compares two resource IDs for equality without reflection. func EqualID(a, b *pbresource.ID) bool { if a == b { diff --git a/internal/resource/equality_test.go b/internal/resource/equality_test.go index 8413905606..f4c17d0ff5 100644 --- a/internal/resource/equality_test.go +++ b/internal/resource/equality_test.go @@ -85,7 +85,6 @@ func TestEqualTenancy(t *testing.T) { t.Run("same pointer", func(t *testing.T) { ten := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", } require.True(t, resource.EqualTenancy(ten, ten)) @@ -94,7 +93,6 @@ func TestEqualTenancy(t *testing.T) { t.Run("equal", func(t *testing.T) { a := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", } b := clone(a) @@ -104,7 +102,6 @@ func TestEqualTenancy(t *testing.T) { t.Run("nil", func(t *testing.T) { a := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", } require.False(t, resource.EqualTenancy(a, nil)) @@ -114,7 +111,6 @@ func TestEqualTenancy(t *testing.T) { t.Run("different Partition", func(t *testing.T) { a := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", } b := clone(a) @@ -122,21 +118,9 @@ func TestEqualTenancy(t *testing.T) { require.False(t, resource.EqualTenancy(a, b)) }) - t.Run("different PeerName", func(t *testing.T) { - a := &pbresource.Tenancy{ - Partition: "foo", - PeerName: "bar", - Namespace: "baz", - } - b := clone(a) - b.PeerName = "qux" - require.False(t, resource.EqualTenancy(a, b)) - }) - t.Run("different Namespace", func(t *testing.T) { a := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", } b := clone(a) @@ -155,7 +139,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -173,7 +156,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -192,7 +174,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -211,7 +192,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -231,7 +211,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -251,7 +230,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -271,7 +249,6 @@ func TestEqualID(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -281,6 +258,8 @@ func TestEqualID(t *testing.T) { b.Uid = ulid.Make().String() require.False(t, resource.EqualID(a, b)) }) + + // TODO(peering/v2) Add test for when the peer tenancy of an object differs } func TestEqualReference(t *testing.T) { @@ -293,7 +272,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -311,7 +289,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -330,7 +307,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -349,7 +325,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -369,7 +344,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -389,7 +363,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -409,7 +382,6 @@ func TestEqualReference(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -419,6 +391,8 @@ func TestEqualReference(t *testing.T) { b.Section = "not-blah" require.False(t, resource.EqualReference(a, b)) }) + + // TODO(peering/v2) add test for peer tenancies differing } func TestReferenceOrIDMatch(t *testing.T) { @@ -431,7 +405,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -445,7 +418,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -463,7 +435,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -477,7 +448,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -496,7 +466,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -510,7 +479,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -529,7 +497,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -543,7 +510,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -562,7 +528,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -576,7 +541,6 @@ func TestReferenceOrIDMatch(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -585,6 +549,8 @@ func TestReferenceOrIDMatch(t *testing.T) { b.Name = "boom" require.False(t, resource.ReferenceOrIDMatch(a, b)) }) + + // TODO(peering/v2) Add tests for peer tenancy matching } func TestEqualStatus(t *testing.T) { @@ -604,7 +570,6 @@ func TestEqualStatus(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo-partition", - PeerName: "foo-peer-name", Namespace: "foo-namespace", }, Name: "foo-name", @@ -666,6 +631,8 @@ func TestEqualStatus(t *testing.T) { "different Condition.Resource.Section": func(s *pbresource.Status) { s.Conditions[0].Resource.Section = "bar-section" }, + + // TODO(peering/v2) Add tests for non-local peers in the resource ref } for desc, modFn := range testCases { t.Run(desc, func(t *testing.T) { @@ -842,12 +809,10 @@ func BenchmarkEqualTenancy(b *testing.B) { // BenchmarkEqualTenancy/reflection-16 2283500 550.3 ns/op 128 B/op 7 allocs/op tenA := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", } tenB := &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "qux", } b.ResetTimer() @@ -877,7 +842,6 @@ func BenchmarkEqualID(b *testing.B) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo", - PeerName: "bar", Namespace: "baz", }, Name: "qux", @@ -920,7 +884,6 @@ func BenchmarkEqualStatus(b *testing.B) { }, Tenancy: &pbresource.Tenancy{ Partition: "foo-partition", - PeerName: "foo-peer-name", Namespace: "foo-namespace", }, Name: "foo-name", diff --git a/internal/resource/errors.go b/internal/resource/errors.go index 24dd96e90e..00f073d8f2 100644 --- a/internal/resource/errors.go +++ b/internal/resource/errors.go @@ -139,22 +139,22 @@ type ErrOwnerTenantInvalid struct { func (err ErrOwnerTenantInvalid) Error() string { if err.ResourceTenancy == nil && err.OwnerTenancy != nil { return fmt.Sprintf( - "empty resource tenancy cannot be owned by a resource in partition %s, namespace %s and peer %s", - err.OwnerTenancy.Partition, err.OwnerTenancy.Namespace, err.OwnerTenancy.PeerName, + "empty resource tenancy cannot be owned by a resource in partition %s and namespace %s", + err.OwnerTenancy.Partition, err.OwnerTenancy.Namespace, ) } if err.ResourceTenancy != nil && err.OwnerTenancy == nil { return fmt.Sprintf( - "resource in partition %s, namespace %s and peer %s cannot be owned by a resource with empty tenancy", - err.ResourceTenancy.Partition, err.ResourceTenancy.Namespace, err.ResourceTenancy.PeerName, + "resource in partition %s and namespace %s cannot be owned by a resource with empty tenancy", + err.ResourceTenancy.Partition, err.ResourceTenancy.Namespace, ) } return fmt.Sprintf( - "resource in partition %s, namespace %s and peer %s cannot be owned by a resource in partition %s, namespace %s and peer %s", - err.ResourceTenancy.Partition, err.ResourceTenancy.Namespace, err.ResourceTenancy.PeerName, - err.OwnerTenancy.Partition, err.OwnerTenancy.Namespace, err.OwnerTenancy.PeerName, + "resource in partition %s and namespace %s cannot be owned by a resource in partition %s and namespace %s", + err.ResourceTenancy.Partition, err.ResourceTenancy.Namespace, + err.OwnerTenancy.Partition, err.OwnerTenancy.Namespace, ) } diff --git a/internal/resource/http/http.go b/internal/resource/http/http.go index 0bc044059e..6be0059669 100644 --- a/internal/resource/http/http.go +++ b/internal/resource/http/http.go @@ -191,16 +191,14 @@ func parseParams(r *http.Request) (tenancy *pbresource.Tenancy, params map[strin if namespace == "" { namespace = query.Get("ns") } - peer := query.Get("peer") - if peer == "" { - peer = query.Get("peer_name") - } + tenancy = &pbresource.Tenancy{ Partition: query.Get("partition"), - PeerName: peer, Namespace: namespace, } + // TODO(peering/v2) handle parsing peer tenancy + resourceName := path.Base(r.URL.Path) if resourceName == "." || resourceName == "/" { resourceName = "" diff --git a/internal/resource/http/http_test.go b/internal/resource/http/http_test.go index 5898681cd1..aae02c694a 100644 --- a/internal/resource/http/http_test.go +++ b/internal/resource/http/http_test.go @@ -270,7 +270,6 @@ func TestResourceWriteHandler(t *testing.T) { }, "tenancy": { "partition": "default", - "peer_name": "local", "namespace": "default" } } diff --git a/internal/resource/mappers/selectiontracker/selection_tracker.go b/internal/resource/mappers/selectiontracker/selection_tracker.go index 5f10e410b9..e684ab8a93 100644 --- a/internal/resource/mappers/selectiontracker/selection_tracker.go +++ b/internal/resource/mappers/selectiontracker/selection_tracker.go @@ -199,11 +199,11 @@ func removeIDFromTreeAtPaths(t *radix.Tree[[]*pbresource.ID], id *pbresource.ID, // treePathFromNameOrPrefix computes radix tree key from the resource tenancy and a selector name or prefix. // The keys will be computed in the following form: -// ///. +// //. func treePathFromNameOrPrefix(tenancy *pbresource.Tenancy, nameOrPrefix string) string { - return fmt.Sprintf("%s/%s/%s/%s", + // TODO(peering/v2) update paths for peer tenancy + return fmt.Sprintf("%s/%s/%s", tenancy.GetPartition(), - tenancy.GetPeerName(), tenancy.GetNamespace(), nameOrPrefix) } diff --git a/internal/resource/mappers/selectiontracker/selection_tracker_test.go b/internal/resource/mappers/selectiontracker/selection_tracker_test.go index 345ac848ab..00df595914 100644 --- a/internal/resource/mappers/selectiontracker/selection_tracker_test.go +++ b/internal/resource/mappers/selectiontracker/selection_tracker_test.go @@ -39,22 +39,14 @@ var ( "bar ns, default partition, local peer": { Partition: "default", Namespace: "bar", - PeerName: "local", }, "default ns, baz partition, local peer": { Partition: "baz", Namespace: "default", - PeerName: "local", }, "bar ns, baz partition, local peer": { Partition: "baz", Namespace: "bar", - PeerName: "local", - }, - "bar ns, baz partition, non-local peer": { - Partition: "baz", - Namespace: "bar", - PeerName: "non-local", }, } ) diff --git a/internal/resource/refkey.go b/internal/resource/refkey.go index 44f0765c20..c22c0b2c7c 100644 --- a/internal/resource/refkey.go +++ b/internal/resource/refkey.go @@ -16,8 +16,8 @@ type ReferenceKey struct { GVK string Partition string // Tenancy.* Namespace string // Tenancy.* - PeerName string // Tenancy.* - Name string + // TODO(peering/v2) account for peer tenancy + Name string } // String returns a string representation of the ReferenceKey. This should not @@ -26,10 +26,10 @@ type ReferenceKey struct { // // This format should be aligned with IDToString and ReferenceToString. func (r ReferenceKey) String() string { - return fmt.Sprintf("%s/%s.%s.%s/%s", + // TODO(peering/v2) account for peer tenancy + return fmt.Sprintf("%s/%s.%s/%s", r.GVK, orDefault(r.Partition, "default"), - orDefault(r.PeerName, "local"), orDefault(r.Namespace, "default"), r.Name, ) @@ -38,7 +38,6 @@ func (r ReferenceKey) String() string { func (r ReferenceKey) GetTenancy() *pbresource.Tenancy { return &pbresource.Tenancy{ Partition: r.Partition, - PeerName: r.PeerName, Namespace: r.Namespace, } } @@ -68,7 +67,6 @@ func NewReferenceKey(refOrID ReferenceOrID) ReferenceKey { GVK: ToGVK(refOrID.GetType()), Partition: orDefault(refOrID.GetTenancy().GetPartition(), "default"), Namespace: orDefault(refOrID.GetTenancy().GetNamespace(), "default"), - PeerName: orDefault(refOrID.GetTenancy().GetPeerName(), "local"), Name: refOrID.GetName(), } } diff --git a/internal/resource/refkey_test.go b/internal/resource/refkey_test.go index 8c4b5eaf92..89f044a39f 100644 --- a/internal/resource/refkey_test.go +++ b/internal/resource/refkey_test.go @@ -15,17 +15,16 @@ import ( ) func TestReferenceKey(t *testing.T) { + // TODO(peering/v2) update the test to account for peer tenancy tenancy1 := &pbresource.Tenancy{} tenancy1_actual := defaultTenancy() tenancy2 := &pbresource.Tenancy{ Partition: "ap1", Namespace: "ns-billing", - PeerName: "peer-dc4", } tenancy3 := &pbresource.Tenancy{ Partition: "ap2", Namespace: "ns-intern", - PeerName: "peer-sea", } res1, err := demo.GenerateV2Artist() @@ -82,6 +81,5 @@ func defaultTenancy() *pbresource.Tenancy { return &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", } } diff --git a/internal/resource/resourcetest/tenancy.go b/internal/resource/resourcetest/tenancy.go index 72757466ed..e43fec6272 100644 --- a/internal/resource/resourcetest/tenancy.go +++ b/internal/resource/resourcetest/tenancy.go @@ -20,6 +20,7 @@ func TestTenancies() []*pbresource.Tenancy { tenancies := []*pbresource.Tenancy{Tenancy("default.default")} if isEnterprise { + // TODO(namespaces/v2) move the default partition + non-default namespace test to run even for CE. tenancies = append(tenancies, Tenancy("default.bar"), Tenancy("foo.default"), Tenancy("foo.bar")) } @@ -29,10 +30,10 @@ func TestTenancies() []*pbresource.Tenancy { // Tenancy constructs a pbresource.Tenancy from a concise string representation // suitable for use in unit tests. // -// - "" : partition="" namespace="" peerName="local" -// - "foo" : partition="foo" namespace="" peerName="local" -// - "foo.bar" : partition="foo" namespace="bar" peerName="local" -// - : partition="BAD" namespace="BAD" peerName="BAD" +// - "" : partition="" namespace="" +// - "foo" : partition="foo" namespace="" +// - "foo.bar" : partition="foo" namespace="bar" +// - : partition="BAD" namespace="BAD" func Tenancy(s string) *pbresource.Tenancy { parts := strings.Split(s, ".") switch len(parts) { @@ -48,7 +49,7 @@ func Tenancy(s string) *pbresource.Tenancy { v.Namespace = parts[1] return v default: - return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD", PeerName: "BAD"} + return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD"} } } diff --git a/internal/resource/sort.go b/internal/resource/sort.go index 1373f08e14..88d4e0d08d 100644 --- a/internal/resource/sort.go +++ b/internal/resource/sort.go @@ -52,10 +52,6 @@ func compareTenancy(a, b *pbresource.Tenancy) int { if diff != 0 { return diff } - diff = compareString(a.PeerName, b.PeerName) - if diff != 0 { - return diff - } return compareString(a.Namespace, b.Namespace) } diff --git a/internal/resource/sort_test.go b/internal/resource/sort_test.go index 3b7622adb1..0cc17d28da 100644 --- a/internal/resource/sort_test.go +++ b/internal/resource/sort_test.go @@ -21,15 +21,14 @@ func TestLessReference(t *testing.T) { t.Skip("too slow for testing.Short") } parseTenancy := func(s string) *pbresource.Tenancy { - // format is: .. + // format is: . parts := strings.Split(s, ".") - if len(parts) != 3 { + if len(parts) != 2 { panic("bad tenancy") } return &pbresource.Tenancy{ Partition: parts[0], - PeerName: parts[1], - Namespace: parts[2], + Namespace: parts[1], } } @@ -39,7 +38,7 @@ func TestLessReference(t *testing.T) { // - // // // type = (gvk style) - // tenancy = .. + // tenancy = . parts := strings.Split(s, "/") require.Len(t, parts, 3) @@ -71,22 +70,20 @@ func TestLessReference(t *testing.T) { for _, version := range vals { for _, kind := range vals { for _, partition := range vals { - for _, peer := range vals { - for _, namespace := range vals { - for _, name := range vals { - for _, section := range sectionVals { - if section != "" { - section = "@" + section - } - inputs = append(inputs, makeRef( - fmt.Sprintf( - "%s.%s.%s/%s.%s.%s/%s%s", - group, version, kind, - partition, peer, namespace, - name, section, - ), - )) + for _, namespace := range vals { + for _, name := range vals { + for _, section := range sectionVals { + if section != "" { + section = "@" + section } + inputs = append(inputs, makeRef( + fmt.Sprintf( + "%s.%s.%s/%s.%s/%s%s", + group, version, kind, + partition, namespace, + name, section, + ), + )) } } } diff --git a/internal/resource/stringer.go b/internal/resource/stringer.go index 075c08ac0d..da27ef52f0 100644 --- a/internal/resource/stringer.go +++ b/internal/resource/stringer.go @@ -49,7 +49,7 @@ func ReferenceToString(ref *pbresource.Reference) string { // should not be relied upon nor parsed and is provided just for debugging and // logging reasons. func TenancyToString(tenancy *pbresource.Tenancy) string { - return fmt.Sprintf("%s.%s.%s", tenancy.Partition, tenancy.PeerName, tenancy.Namespace) + return fmt.Sprintf("%s.%s", tenancy.Partition, tenancy.Namespace) } // TypeToString returns a string representation of pbresource.Type. This should diff --git a/internal/resource/tenancy.go b/internal/resource/tenancy.go index 597253aa8d..e46322557d 100644 --- a/internal/resource/tenancy.go +++ b/internal/resource/tenancy.go @@ -54,18 +54,13 @@ func (s Scope) String() string { // DefaultClusteredTenancy returns the default tenancy for a cluster scoped resource. func DefaultClusteredTenancy() *pbresource.Tenancy { - return &pbresource.Tenancy{ - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - PeerName: DefaultPeerName, - } + return &pbresource.Tenancy{} } // DefaultPartitionedTenancy returns the default tenancy for a partition scoped resource. func DefaultPartitionedTenancy() *pbresource.Tenancy { return &pbresource.Tenancy{ Partition: DefaultPartitionName, - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - PeerName: DefaultPeerName, } } @@ -74,8 +69,6 @@ func DefaultNamespacedTenancy() *pbresource.Tenancy { return &pbresource.Tenancy{ Partition: DefaultPartitionName, Namespace: DefaultNamespaceName, - // TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy - PeerName: DefaultPeerName, } } @@ -129,10 +122,6 @@ func defaultTenancy(itemTenancy, parentTenancy, scopeTenancy *pbresource.Tenancy panic("scope tenancy is required") } - if itemTenancy.PeerName == "" { - itemTenancy.PeerName = DefaultPeerName - } - if parentTenancy != nil { // Recursively normalize this tenancy as well. defaultTenancy(parentTenancy, nil, scopeTenancy) @@ -143,16 +132,6 @@ func defaultTenancy(itemTenancy, parentTenancy, scopeTenancy *pbresource.Tenancy parentTenancy = scopeTenancy } - if !equalOrEmpty(itemTenancy.PeerName, DefaultPeerName) { - panic("peering is not supported yet for resource tenancies") - } - if !equalOrEmpty(parentTenancy.PeerName, DefaultPeerName) { - panic("peering is not supported yet for parent tenancies") - } - if !equalOrEmpty(scopeTenancy.PeerName, DefaultPeerName) { - panic("peering is not supported yet for scopes") - } - // Only retain the parts of the parent that apply to this resource. if scopeTenancy.Partition == "" { parentTenancy.Partition = "" diff --git a/internal/resource/tenancy_test.go b/internal/resource/tenancy_test.go index 654ebb183d..be3445a2aa 100644 --- a/internal/resource/tenancy_test.go +++ b/internal/resource/tenancy_test.go @@ -232,6 +232,6 @@ func newTestTenancy(s string) *pbresource.Tenancy { v.Namespace = parts[1] return v default: - return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD", PeerName: "BAD"} + return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD"} } } diff --git a/internal/storage/conformance/conformance.go b/internal/storage/conformance/conformance.go index 543a574fb5..762159d0ff 100644 --- a/internal/storage/conformance/conformance.go +++ b/internal/storage/conformance/conformance.go @@ -314,7 +314,6 @@ func testListWatch(t *testing.T, opts TestOptions) { resourceType: storage.UnversionedTypeFrom(typeAv1), tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, namePrefix: "", @@ -324,14 +323,12 @@ func testListWatch(t *testing.T, opts TestOptions) { seedData[2], seedData[3], seedData[5], - seedData[6], }, }, - "fixed partition, wildcard peer, wildcard namespace": { + "fixed partition, wildcard namespace": { resourceType: storage.UnversionedTypeFrom(typeAv1), tenancy: &pbresource.Tenancy{ Partition: "default", - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, namePrefix: "", @@ -340,30 +337,12 @@ func testListWatch(t *testing.T, opts TestOptions) { seedData[1], seedData[2], seedData[5], - seedData[6], }, }, - "wildcard partition, fixed peer, wildcard namespace": { + "wildcard partition, fixed namespace": { resourceType: storage.UnversionedTypeFrom(typeAv1), tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: "local", - Namespace: storage.Wildcard, - }, - namePrefix: "", - results: []*pbresource.Resource{ - seedData[0], - seedData[1], - seedData[2], - seedData[3], - seedData[5], - }, - }, - "wildcard partition, wildcard peer, fixed namespace": { - resourceType: storage.UnversionedTypeFrom(typeAv1), - tenancy: &pbresource.Tenancy{ - Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: "default", }, namePrefix: "", @@ -371,29 +350,12 @@ func testListWatch(t *testing.T, opts TestOptions) { seedData[0], seedData[1], seedData[2], - seedData[6], - }, - }, - "fixed partition, fixed peer, wildcard namespace": { - resourceType: storage.UnversionedTypeFrom(typeAv1), - tenancy: &pbresource.Tenancy{ - Partition: "default", - PeerName: "local", - Namespace: storage.Wildcard, - }, - namePrefix: "", - results: []*pbresource.Resource{ - seedData[0], - seedData[1], - seedData[2], - seedData[5], }, }, "wildcard tenancy, name prefix": { resourceType: storage.UnversionedTypeFrom(typeAv1), tenancy: &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, }, namePrefix: "a", @@ -402,9 +364,9 @@ func testListWatch(t *testing.T, opts TestOptions) { seedData[1], seedData[3], seedData[5], - seedData[6], }, }, + // TODO(peering/v2) add tests for peer tenancy } t.Run("List", func(t *testing.T) { @@ -610,23 +572,15 @@ var ( } tenancyDefault = &pbresource.Tenancy{ Partition: "default", - PeerName: "local", Namespace: "default", } tenancyDefaultOtherNamespace = &pbresource.Tenancy{ Partition: "default", - PeerName: "local", Namespace: "other", } - tenancyDefaultOtherPeer = &pbresource.Tenancy{ - Partition: "default", - PeerName: "remote", - Namespace: "default", - } tenancyOther = &pbresource.Tenancy{ Partition: "billing", - PeerName: "local", Namespace: "payments", } @@ -637,7 +591,6 @@ var ( resource(typeAv1, tenancyOther, "api"), // 3 resource(typeB, tenancyDefault, "admin"), // 4 resource(typeAv1, tenancyDefaultOtherNamespace, "autoscaler"), // 5 - resource(typeAv1, tenancyDefaultOtherPeer, "amplifier"), // 6 } ignoreVersion = protocmp.IgnoreFields(&pbresource.Resource{}, "version") diff --git a/internal/storage/inmem/schema.go b/internal/storage/inmem/schema.go index 37e39dbc57..0565d58b2f 100644 --- a/internal/storage/inmem/schema.go +++ b/internal/storage/inmem/schema.go @@ -142,7 +142,6 @@ func indexFromType(t storage.UnversionedType) []byte { func indexFromTenancy(t *pbresource.Tenancy) []byte { var b indexBuilder b.String(t.Partition) - b.String(t.PeerName) b.String(t.Namespace) return b.Bytes() } @@ -151,6 +150,7 @@ func indexFromID(id *pbresource.ID, includeUid bool) []byte { var b indexBuilder b.Raw(indexFromType(storage.UnversionedTypeFrom(id.Type))) b.Raw(indexFromTenancy(id.Tenancy)) + // TODO(peering/v2) handle peer tenancy for indexing b.String(id.Name) if includeUid { b.String(id.Uid) @@ -184,14 +184,14 @@ type query struct { // // Our radix tree keys are structured like so: // -// +// // // Where each segment is followed by a NULL terminator. // // In order to handle wildcard queries, we return a prefix up to the wildcarded // field. For example: // -// Query: type={mesh,v1,service}, partition=default, peer=*, namespace=default +// Query: type={mesh,v1,service}, partition=default, namespace=default // Prefix: mesh[NULL]v1[NULL]service[NULL]default[NULL] // // Which means that we must manually apply filters after the wildcard (i.e. @@ -206,18 +206,14 @@ func (q query) indexPrefix() []byte { b.String(v) } - if v := q.tenancy.PeerName; v == storage.Wildcard { - return b.Bytes() - } else { - b.String(v) - } - if v := q.tenancy.Namespace; v == storage.Wildcard { return b.Bytes() } else { b.String(v) } + // TODO(peering/v2) handle peer tenancies + if q.namePrefix != "" { b.Raw([]byte(q.namePrefix)) } @@ -234,14 +230,12 @@ func (q query) matches(res *pbresource.Resource) bool { return false } - if q.tenancy.PeerName != storage.Wildcard && res.Id.Tenancy.PeerName != q.tenancy.PeerName { - return false - } - if q.tenancy.Namespace != storage.Wildcard && res.Id.Tenancy.Namespace != q.tenancy.Namespace { return false } + // TODO(peering/v2) handle peer tenancies + if len(q.namePrefix) != 0 && !strings.HasPrefix(res.Id.Name, q.namePrefix) { return false } diff --git a/internal/storage/inmem/snapshot_test.go b/internal/storage/inmem/snapshot_test.go index f3e1bdbaa7..22757d5f57 100644 --- a/internal/storage/inmem/snapshot_test.go +++ b/internal/storage/inmem/snapshot_test.go @@ -28,7 +28,6 @@ func TestSnapshotRestore(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "default", - PeerName: "local", Namespace: "default", }, Name: "billing", @@ -51,7 +50,6 @@ func TestSnapshotRestore(t *testing.T) { }, Tenancy: &pbresource.Tenancy{ Partition: "default", - PeerName: "local", Namespace: "default", }, Name: "api", diff --git a/internal/storage/inmem/store.go b/internal/storage/inmem/store.go index d9c27d339f..051edd4c89 100644 --- a/internal/storage/inmem/store.go +++ b/internal/storage/inmem/store.go @@ -234,8 +234,8 @@ func (s *Store) WatchList(typ storage.UnversionedType, ten *pbresource.Tenancy, // relevant resources only, which is far more efficient. var sub stream.Subject if ten.Partition == storage.Wildcard || - ten.PeerName == storage.Wildcard || ten.Namespace == storage.Wildcard { + // TODO(peering/v2) update conditional to handle peer tenancy wildcards sub = wildcardSubject{typ} } else { sub = tenancySubject{typ, ten} diff --git a/internal/storage/inmem/watch.go b/internal/storage/inmem/watch.go index bdab0fc5ee..7660d7b5c2 100644 --- a/internal/storage/inmem/watch.go +++ b/internal/storage/inmem/watch.go @@ -122,6 +122,7 @@ func (s wildcardSubject) String() string { } type tenancySubject struct { + // TODO(peering/v2) update tenancy subject to account for peer tenancies resourceType storage.UnversionedType tenancy *pbresource.Tenancy } @@ -130,7 +131,7 @@ func (s tenancySubject) String() string { return s.resourceType.Group + indexSeparator + s.resourceType.Kind + indexSeparator + s.tenancy.Partition + indexSeparator + - s.tenancy.PeerName + indexSeparator + + s.tenancy.Namespace } @@ -179,9 +180,9 @@ func (s *Store) watchSnapshot(req stream.SubscribeRequest, snap stream.SnapshotA q.resourceType = t.resourceType q.tenancy = &pbresource.Tenancy{ Partition: storage.Wildcard, - PeerName: storage.Wildcard, Namespace: storage.Wildcard, } + // TODO(peering/v2) maybe handle wildcards in peer tenancy default: return 0, fmt.Errorf("unhandled subject type: %T", req.Subject) } diff --git a/internal/tenancy/internal/controllers/namespace/controller.go b/internal/tenancy/internal/controllers/namespace/controller.go index 22a3e19e40..da787abca7 100644 --- a/internal/tenancy/internal/controllers/namespace/controller.go +++ b/internal/tenancy/internal/controllers/namespace/controller.go @@ -78,7 +78,6 @@ func ensureDeleted(ctx context.Context, rt controller.Runtime, registry resource tenancy := &pbresource.Tenancy{ Partition: res.Id.Tenancy.Partition, Namespace: res.Id.Name, - PeerName: resource.DefaultPeerName, } // Delete namespace scoped tenants if err := common.EnsureTenantsDeleted(ctx, rt, registry, res, resource.ScopeNamespace, tenancy); err != nil { diff --git a/internal/tenancy/tenancytest/namespace_controller_test.go b/internal/tenancy/tenancytest/namespace_controller_test.go index 574ee92cd4..185e9d4b4a 100644 --- a/internal/tenancy/tenancytest/namespace_controller_test.go +++ b/internal/tenancy/tenancytest/namespace_controller_test.go @@ -85,7 +85,6 @@ func (ts *nsTestSuite) TestNamespaceController_HappyPath() { WithTenancy(&pbresource.Tenancy{ Partition: resource.DefaultPartitionName, Namespace: ns1.Id.Name, - PeerName: resource.DefaultPeerName, }). WithData(ts.T(), &pbdemo.Artist{Name: "Moonchild"}). Write(ts.T(), ts.client) @@ -116,7 +115,6 @@ func (ts *nsTestSuite) TestNamespaceController_DeleteBlockedByTenantsWithFinaliz WithTenancy(&pbresource.Tenancy{ Partition: resource.DefaultPartitionName, Namespace: ns1.Id.Name, - PeerName: resource.DefaultPeerName, }). WithData(ts.T(), &pbdemo.Artist{Name: "Weezer"}). Write(ts.T(), ts.client) @@ -126,7 +124,6 @@ func (ts *nsTestSuite) TestNamespaceController_DeleteBlockedByTenantsWithFinaliz WithTenancy(&pbresource.Tenancy{ Partition: resource.DefaultPartitionName, Namespace: ns1.Id.Name, - PeerName: resource.DefaultPeerName, }). WithData(ts.T(), &pbdemo.Artist{Name: "Foo Fighters"}). WithMeta(resource.FinalizerKey, "finalizer2"). diff --git a/proto-public/pbauth/v2beta1/traffic_permissions_addon.go b/proto-public/pbauth/v2beta1/traffic_permissions_addon.go index 758ffd6d0a..f457aa7596 100644 --- a/proto-public/pbauth/v2beta1/traffic_permissions_addon.go +++ b/proto-public/pbauth/v2beta1/traffic_permissions_addon.go @@ -16,10 +16,10 @@ type SourceToSpiffe interface { var _ SourceToSpiffe = (*Source)(nil) var _ SourceToSpiffe = (*ExcludeSource)(nil) +// TODO(peering/v2) handle peer tenancies which probably requires outputting a second object func SourceToTenancy(s SourceToSpiffe) *pbresource.Tenancy { return &pbresource.Tenancy{ Partition: s.GetPartition(), Namespace: s.GetNamespace(), - PeerName: s.GetPeer(), } } diff --git a/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go b/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go index 073573e857..dc318370c1 100644 --- a/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go +++ b/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go @@ -158,7 +158,6 @@ func newFailoverRef(name string) *pbresource.Reference { Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: name, } diff --git a/proto-public/pbmesh/v2beta1/xroute_addons_test.go b/proto-public/pbmesh/v2beta1/xroute_addons_test.go index 95c1f54d4a..d0ac21b17b 100644 --- a/proto-public/pbmesh/v2beta1/xroute_addons_test.go +++ b/proto-public/pbmesh/v2beta1/xroute_addons_test.go @@ -153,7 +153,6 @@ func newRouteRef(name string) *pbresource.Reference { Tenancy: &pbresource.Tenancy{ Partition: "default", Namespace: "default", - PeerName: "local", }, Name: name, } diff --git a/proto-public/pbresource/resource.pb.go b/proto-public/pbresource/resource.pb.go index 943ae9a21a..0f8f53405e 100644 --- a/proto-public/pbresource/resource.pb.go +++ b/proto-public/pbresource/resource.pb.go @@ -228,12 +228,6 @@ type Tenancy struct { // When using the List and WatchList endpoints, provide the wildcard value "*" // to list resources across all namespaces. Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` - // PeerName identifies which peer the resource is imported from. - // https://developer.hashicorp.com/consul/docs/connect/cluster-peering - // - // When using the List and WatchList endpoints, provide the wildcard value "*" - // to list resources across all peers. - PeerName string `protobuf:"bytes,3,opt,name=peer_name,json=peerName,proto3" json:"peer_name,omitempty"` } func (x *Tenancy) Reset() { @@ -282,13 +276,6 @@ func (x *Tenancy) GetNamespace() string { return "" } -func (x *Tenancy) GetPeerName() string { - if x != nil { - return x.PeerName - } - return "" -} - // ID uniquely identifies a resource. type ID struct { state protoimpl.MessageState @@ -1669,277 +1656,275 @@ var file_pbresource_resource_proto_rawDesc = []byte{ 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, - 0x22, 0x62, 0x0a, 0x07, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x70, + 0x22, 0x45, 0x0a, 0x07, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x65, 0x65, 0x72, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, - 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x9d, 0x01, 0x0a, 0x02, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x9d, 0x01, 0x0a, 0x02, 0x49, 0x44, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, + 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, + 0x61, 0x6e, 0x63, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, + 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, + 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x22, 0x85, 0x04, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, + 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, + 0x44, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x4d, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, + 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x12, 0x47, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, + 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x1a, 0x5c, 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x21, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, + 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0xba, 0x01, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x62, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, + 0x64, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x0a, 0x63, + 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, + 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22, 0x92, 0x02, 0x0a, + 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, + 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x40, + 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, + 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x40, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, + 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x22, 0x3b, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x11, 0x0a, + 0x0d, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, + 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x52, 0x55, 0x45, 0x10, 0x01, + 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x46, 0x41, 0x4c, 0x53, 0x45, 0x10, + 0x02, 0x22, 0xac, 0x01, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, + 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, + 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, + 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, + 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, + 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x40, 0x0a, 0x09, 0x54, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x12, 0x33, 0x0a, + 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, 0x6f, 0x77, 0x6e, + 0x65, 0x72, 0x22, 0x3c, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, + 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64, + 0x22, 0x4f, 0x0a, 0x0c, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e, - 0x61, 0x6e, 0x63, 0x79, 0x22, 0x85, 0x04, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x72, 0x65, + 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6e, 0x61, 0x6d, 0x65, 0x50, + 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0x51, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, + 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x49, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, + 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, + 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, - 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x33, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, - 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, - 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, - 0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x4d, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x47, - 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, - 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, - 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5c, - 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, - 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, - 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xba, 0x01, 0x0a, - 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x62, 0x73, 0x65, 0x72, - 0x76, 0x65, 0x64, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x47, 0x65, - 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x64, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x39, - 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22, 0x92, 0x02, 0x0a, 0x09, 0x43, 0x6f, - 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x05, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, - 0x40, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, - 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x22, 0x3b, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x54, - 0x41, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0e, 0x0a, - 0x0a, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x52, 0x55, 0x45, 0x10, 0x01, 0x12, 0x0f, 0x0a, - 0x0b, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x46, 0x41, 0x4c, 0x53, 0x45, 0x10, 0x02, 0x22, 0xac, - 0x01, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x04, - 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, - 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, - 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, - 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x40, 0x0a, - 0x09, 0x54, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x12, 0x33, 0x0a, 0x05, 0x6f, 0x77, - 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, - 0x3c, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4f, 0x0a, - 0x0c, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, + 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, 0x6f, 0x77, + 0x6e, 0x65, 0x72, 0x22, 0x58, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, + 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, + 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x4f, 0x0a, + 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xa1, - 0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, - 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, - 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, - 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, - 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x72, 0x65, 0x66, - 0x69, 0x78, 0x22, 0x51, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, - 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x49, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, - 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x05, 0x6f, - 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, - 0x22, 0x58, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, - 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x4f, 0x0a, 0x0c, 0x57, 0x72, - 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x0d, 0x57, - 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x08, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, - 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, - 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xaa, 0x01, - 0x0a, 0x12, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, - 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x21, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, - 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x56, 0x0a, 0x13, 0x57, 0x72, - 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, + 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x50, + 0x0a, 0x0d, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, + 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x22, 0xaa, 0x01, 0x0a, 0x12, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, - 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x22, 0x58, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, - 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x10, 0x0a, 0x0e, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa6, - 0x01, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, - 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, - 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, - 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, - 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6e, 0x61, 0x6d, - 0x65, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0xf0, 0x01, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, - 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, - 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x52, 0x0a, 0x09, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, - 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, - 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x53, 0x45, - 0x52, 0x54, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, - 0x4e, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x22, 0x5b, 0x0a, 0x18, 0x4d, 0x75, - 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, - 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x5c, 0x0a, 0x19, 0x4d, 0x75, 0x74, 0x61, 0x74, - 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x49, 0x44, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x56, 0x0a, + 0x13, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x32, 0x8e, 0x07, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x61, 0x0a, 0x04, 0x52, 0x65, 0x61, - 0x64, 0x12, 0x26, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, - 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x12, 0x64, 0x0a, 0x05, - 0x57, 0x72, 0x69, 0x74, 0x65, 0x12, 0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, - 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, - 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, - 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, - 0x10, 0x0b, 0x12, 0x76, 0x0a, 0x0b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x12, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x72, - 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, - 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x72, 0x69, - 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x0b, 0x12, 0x61, 0x0a, 0x04, 0x4c, 0x69, - 0x73, 0x74, 0x12, 0x26, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, - 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x68, 0x61, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x58, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, + 0x44, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, + 0x10, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0xa6, 0x01, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, + 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, + 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, + 0x52, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, + 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0xf0, 0x01, 0x0a, 0x0a, 0x57, + 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x09, 0x6f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x12, 0x76, 0x0a, - 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x2d, 0x2e, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, - 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x68, 0x61, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, + 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x52, 0x0a, 0x09, 0x4f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, + 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, + 0x00, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, + 0x50, 0x53, 0x45, 0x52, 0x54, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, + 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x22, 0x5b, 0x0a, + 0x18, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, - 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, - 0x04, 0x08, 0x02, 0x10, 0x0b, 0x12, 0x67, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, - 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, - 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x0b, 0x12, 0x6b, - 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2b, 0x2e, 0x68, 0x61, - 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, - 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x22, - 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x30, 0x01, 0x12, 0x88, 0x01, 0x0a, 0x11, - 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, - 0x65, 0x12, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4d, 0x75, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x5c, 0x0a, 0x19, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, - 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x2e, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, - 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, - 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x42, 0xe9, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x68, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x32, 0x8e, 0x07, 0x0a, 0x0f, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x61, 0x0a, 0x04, + 0x52, 0x65, 0x61, 0x64, 0x12, 0x26, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, + 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, - 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, - 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xa2, 0x02, - 0x03, 0x48, 0x43, 0x52, 0xaa, 0x02, 0x19, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, - 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0xca, 0x02, 0x19, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, - 0x73, 0x75, 0x6c, 0x5c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xe2, 0x02, 0x25, 0x48, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, - 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1b, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, - 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x12, + 0x64, 0x0a, 0x05, 0x57, 0x72, 0x69, 0x74, 0x65, 0x12, 0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, + 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, + 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x72, + 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, + 0x04, 0x08, 0x03, 0x10, 0x0b, 0x12, 0x76, 0x0a, 0x0b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x12, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, + 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, + 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, + 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x0b, 0x12, 0x61, 0x0a, + 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, + 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, + 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, + 0x12, 0x76, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, + 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, + 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, + 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, + 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, + 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x12, 0x67, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x12, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, + 0x0b, 0x12, 0x6b, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2b, + 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, + 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x68, 0x61, + 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x30, 0x01, 0x12, 0x88, + 0x01, 0x0a, 0x11, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, + 0x64, 0x61, 0x74, 0x65, 0x12, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, + 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x56, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x42, 0xe9, 0x01, 0x0a, 0x1d, 0x63, 0x6f, + 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, + 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x0d, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, + 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, + 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x52, 0xaa, 0x02, 0x19, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, + 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0xca, 0x02, 0x19, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, + 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xe2, + 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, + 0x75, 0x6c, 0x5c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1b, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, + 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto-public/pbresource/resource.proto b/proto-public/pbresource/resource.proto index eb95f658b3..1a36492265 100644 --- a/proto-public/pbresource/resource.proto +++ b/proto-public/pbresource/resource.proto @@ -41,13 +41,6 @@ message Tenancy { // When using the List and WatchList endpoints, provide the wildcard value "*" // to list resources across all namespaces. string namespace = 2; - - // PeerName identifies which peer the resource is imported from. - // https://developer.hashicorp.com/consul/docs/connect/cluster-peering - // - // When using the List and WatchList endpoints, provide the wildcard value "*" - // to list resources across all peers. - string peer_name = 3; } // ID uniquely identifies a resource. diff --git a/test-integ/catalogv2/explicit_destinations_l7_test.go b/test-integ/catalogv2/explicit_destinations_l7_test.go index 8ea21e012d..63d1473d4d 100644 --- a/test-integ/catalogv2/explicit_destinations_l7_test.go +++ b/test-integ/catalogv2/explicit_destinations_l7_test.go @@ -168,7 +168,6 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode tenancy := &pbresource.Tenancy{ Partition: currentTenancy.Partition, Namespace: currentTenancy.Namespace, - PeerName: "local", } v1ServerNode := &topology.Node{ diff --git a/test-integ/catalogv2/explicit_destinations_test.go b/test-integ/catalogv2/explicit_destinations_test.go index ab2a49fe79..5529a5a73a 100644 --- a/test-integ/catalogv2/explicit_destinations_test.go +++ b/test-integ/catalogv2/explicit_destinations_test.go @@ -151,7 +151,6 @@ func (c testBasicL4ExplicitDestinationsCreator) topologyConfigAddNodes( tenancy *pbresource.Tenancy, ) { clusterName := cluster.Name - tenancy.PeerName = "local" newID := func(name string, tenancy *pbresource.Tenancy) topology.ID { return topology.ID{ diff --git a/testing/deployer/topology/compile.go b/testing/deployer/topology/compile.go index 50bc770a69..54bd2aa403 100644 --- a/testing/deployer/topology/compile.go +++ b/testing/deployer/topology/compile.go @@ -179,13 +179,11 @@ func compile(logger hclog.Logger, raw *Config, prev *Topology) (*Topology, error if res.Id.Tenancy == nil { res.Id.Tenancy = &pbresource.Tenancy{} } - switch res.Id.Tenancy.PeerName { - case "", "local": - default: - return nil, fmt.Errorf("resources cannot target non-local peers") - } + // TODO(peering/v2) prevent non-local peer resources res.Id.Tenancy.Partition = PartitionOrDefault(res.Id.Tenancy.Partition) - res.Id.Tenancy.Namespace = NamespaceOrDefault(res.Id.Tenancy.Namespace) + if !util.IsTypePartitionScoped(res.Id.Type) { + res.Id.Tenancy.Namespace = NamespaceOrDefault(res.Id.Tenancy.Namespace) + } switch { case util.EqualType(pbauth.ComputedTrafficPermissionsType, res.Id.GetType()), diff --git a/testing/deployer/util/v2.go b/testing/deployer/util/v2.go index fcfc6d194d..cebae23a3a 100644 --- a/testing/deployer/util/v2.go +++ b/testing/deployer/util/v2.go @@ -6,6 +6,7 @@ package util import ( "fmt" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" ) @@ -51,7 +52,7 @@ func ReferenceToString(ref *pbresource.Reference) string { // should not be relied upon nor parsed and is provided just for debugging and // logging reasons. func TenancyToString(tenancy *pbresource.Tenancy) string { - return fmt.Sprintf("%s.%s.%s", tenancy.Partition, tenancy.PeerName, tenancy.Namespace) + return fmt.Sprintf("%s.%s", tenancy.Partition, tenancy.Namespace) } // TypeToString returns a string representation of pbresource.Type. This should @@ -79,3 +80,13 @@ func EqualType(a, b *pbresource.Type) bool { a.GroupVersion == b.GroupVersion && a.Kind == b.Kind } + +func IsTypePartitionScoped(typ *pbresource.Type) bool { + + switch typ.Kind { + case pbmulticluster.SamenessGroupType.Kind: + return true + } + + return false +} diff --git a/website/content/docs/k8s/multiport/reference/resource-command.mdx b/website/content/docs/k8s/multiport/reference/resource-command.mdx index b7845787e3..432a5777ca 100644 --- a/website/content/docs/k8s/multiport/reference/resource-command.mdx +++ b/website/content/docs/k8s/multiport/reference/resource-command.mdx @@ -11,7 +11,7 @@ Command: `consul resource` Use the `resource` command to apply, list, read, and delete resources when interacting with Consul's v2 catalog through the command line. For more information, refer to [v2 catalog API](/consul/docs/concept/catalog/v2). -The `consul resource` command has usage limitations in Consul v1.17.0. The CLI does not accept partition, namespace, and peer arguments, but the v2 catalog outputs this information when you add the `read` or `list` subcommand. In addition, do not use the `apply` and `delete` commands with Consul on Kubernetes in this release. Use the `kubectl` command to apply or delete resources instead. Refer to [configure multi-port services](/consul/docs/k8s/multiport/configure) for an example of the workflow to apply resources. +The `consul resource` command has usage limitations in Consul v1.17.0. The CLI does not accept the partition and namespace arguments, but the v2 catalog outputs this information when you add the `read` or `list` subcommand. In addition, do not use the `apply` and `delete` commands with Consul on Kubernetes in this release. Use the `kubectl` command to apply or delete resources instead. Refer to [configure multi-port services](/consul/docs/k8s/multiport/configure) for an example of the workflow to apply resources. ## Usage @@ -98,7 +98,6 @@ The following flags enable you to filter results. - `-partition=` - The partition where the resources apply. - `-namespace=` - The namespace where the resources apply. -- `-peer=` - The clusters with established cluster peering connections where the resources apply. #### Example usage @@ -137,7 +136,6 @@ $ consul resource list catalog.v2beta1.Service "tenancy": { "namespace": "default", "partition": "default", - "peerName": "local" }, "type": { "group": "catalog", @@ -200,7 +198,6 @@ $ consul resource list catalog.v2beta1.Service "tenancy": { "namespace": "default", "partition": "default", - "peerName": "local" }, "type": { "group": "catalog", @@ -263,7 +260,6 @@ $ consul resource list catalog.v2beta1.Service "tenancy": { "namespace": "default", "partition": "default", - "peerName": "local" }, "type": { "group": "catalog", @@ -318,7 +314,6 @@ The following table shows the required [ACL permissions](/consul/api-docs/api-st - `-partition=` - The partition where the resource applies. - `-namespace=` - The namespace where the resource applies. -- `-peer=` - The clusters with established cluster peering connections where the resource applies. - `-stale` - Permits any Consul server to respond to the request. This flag enables for lower latency and higher throughput, but may result in stale data. This option has no effect on non-read operations. - `-token` - A Consul ACL token to include with the request. @@ -357,7 +352,6 @@ $ consul resource read catalog.v2beta1.Service web "tenancy": { "namespace": "default", "partition": "default", - "peerName": "local" }, "type": { "group": "catalog",