From 33ec81b40e51ce07a92bee417656da502cdb05b9 Mon Sep 17 00:00:00 2001 From: eunsang Date: Wed, 20 Aug 2025 02:05:46 +0900 Subject: [PATCH] xds: move all functionality from `xds/internal` to `internal/xds` (#8515) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes grpc#7290, ensuring that only user-facing functionality remains in the top-level xds package. Updates all import paths and aliases to reference the new internal/xds package, using aliases (e.g., `internal` → `xds` or `xdsinternal`) where needed to minimize changes to call sites. No functional changes intended; this is purely a package path reorganization. RELEASE NOTES: none --- .github/workflows/testing.yml | 2 +- gcp/observability/go.sum | 5 ++ .../xds}/balancer/balancer.go | 12 +-- .../cdsbalancer/aggregate_cluster_test.go | 46 +++++----- .../xds}/balancer/cdsbalancer/cdsbalancer.go | 6 +- .../cdsbalancer/cdsbalancer_security_test.go | 2 +- .../balancer/cdsbalancer/cdsbalancer_test.go | 10 +-- .../balancer/cdsbalancer/cluster_watcher.go | 2 +- .../xds}/balancer/cdsbalancer/logging.go | 0 .../balancer/clusterimpl/balancer_test.go | 13 ++- .../xds}/balancer/clusterimpl/clusterimpl.go | 15 ++-- .../xds}/balancer/clusterimpl/config.go | 0 .../xds}/balancer/clusterimpl/config_test.go | 0 .../xds}/balancer/clusterimpl/logging.go | 0 .../xds}/balancer/clusterimpl/picker.go | 8 +- .../clusterimpl/tests/balancer_test.go | 0 .../clustermanager/balancerstateaggregator.go | 0 .../balancer/clustermanager/clustermanager.go | 0 .../clustermanager/clustermanager_test.go | 0 .../xds}/balancer/clustermanager/config.go | 0 .../balancer/clustermanager/config_test.go | 2 +- .../e2e_test/clustermanager_test.go | 0 .../xds}/balancer/clustermanager/picker.go | 0 .../clusterresolver/clusterresolver.go | 8 +- .../clusterresolver/clusterresolver_test.go | 0 .../xds}/balancer/clusterresolver/config.go | 2 +- .../balancer/clusterresolver/config_test.go | 2 +- .../balancer/clusterresolver/configbuilder.go | 16 ++-- .../configbuilder_childname.go | 4 +- .../configbuilder_childname_test.go | 4 +- .../clusterresolver/configbuilder_test.go | 18 ++-- .../e2e_test/aggregate_cluster_test.go | 4 +- .../clusterresolver/e2e_test/balancer_test.go | 16 ++-- .../clusterresolver/e2e_test/eds_impl_test.go | 8 +- .../xds}/balancer/clusterresolver/logging.go | 0 .../clusterresolver/resource_resolver.go | 2 +- .../clusterresolver/resource_resolver_dns.go | 0 .../clusterresolver/resource_resolver_eds.go | 2 +- .../balancer/loadstore/load_store_wrapper.go | 4 +- .../balancer/outlierdetection/balancer.go | 0 .../outlierdetection/balancer_test.go | 2 +- .../balancer/outlierdetection/callcounter.go | 0 .../outlierdetection/callcounter_test.go | 0 .../xds}/balancer/outlierdetection/config.go | 0 .../balancer/outlierdetection/config_test.go | 0 .../e2e_test/outlierdetection_test.go | 2 +- .../xds}/balancer/outlierdetection/logging.go | 0 .../outlierdetection/subconn_wrapper.go | 0 .../xds}/balancer/priority/balancer.go | 0 .../xds}/balancer/priority/balancer_child.go | 0 .../balancer/priority/balancer_priority.go | 0 .../xds}/balancer/priority/balancer_test.go | 0 .../xds}/balancer/priority/config.go | 0 .../xds}/balancer/priority/config_test.go | 0 .../balancer/priority/ignore_resolve_now.go | 0 .../priority/ignore_resolve_now_test.go | 0 .../xds}/balancer/priority/logging.go | 0 .../xds}/balancer/wrrlocality/balancer.go | 4 +- .../balancer/wrrlocality/balancer_test.go | 8 +- .../xds}/balancer/wrrlocality/logging.go | 0 .../xds}/clients/config.go | 0 .../clients/grpctransport/examples_test.go | 4 +- .../clients/grpctransport/grpc_transport.go | 2 +- .../grpctransport/grpc_transport_ext_test.go | 8 +- .../grpctransport/grpc_transport_test.go | 2 +- .../xds}/clients/internal/backoff/backoff.go | 0 .../xds}/clients/internal/buffer/unbounded.go | 0 .../clients/internal/buffer/unbounded_test.go | 0 .../xds}/clients/internal/internal.go | 2 +- .../xds}/clients/internal/internal_test.go | 2 +- .../xds}/clients/internal/pretty/pretty.go | 0 .../internal/syncutil/callback_serializer.go | 2 +- .../syncutil/callback_serializer_test.go | 0 .../xds}/clients/internal/syncutil/event.go | 0 .../clients/internal/syncutil/event_test.go | 0 .../clients/internal/testutils/channel.go | 0 .../internal/testutils/e2e/clientresources.go | 0 .../clients/internal/testutils/e2e/logging.go | 0 .../clients/internal/testutils/e2e/server.go | 2 +- .../internal/testutils/fakeserver/server.go | 2 +- .../clients/internal/testutils/marshal_any.go | 0 .../testutils/restartable_listener.go | 0 .../clients/internal/testutils/wrappers.go | 0 .../clients/lrsclient/internal/internal.go | 0 .../xds}/clients/lrsclient/load_store.go | 4 +- .../xds}/clients/lrsclient/load_store_test.go | 4 +- .../xds}/clients/lrsclient/loadreport_test.go | 14 ++-- .../xds}/clients/lrsclient/logging.go | 0 .../xds}/clients/lrsclient/lrs_stream.go | 2 +- .../xds}/clients/lrsclient/lrsclient.go | 6 +- .../xds}/clients/lrsclient/lrsconfig.go | 2 +- .../xds}/clients/transport_builder.go | 0 .../xds}/clients/xdsclient/ads_stream.go | 10 +-- .../xds}/clients/xdsclient/authority.go | 8 +- .../xds}/clients/xdsclient/channel.go | 10 +-- .../xds}/clients/xdsclient/channel_test.go | 12 +-- .../clients/xdsclient/clientimpl_watchers.go | 2 +- .../xds}/clients/xdsclient/helpers_test.go | 4 +- .../clients/xdsclient/internal/internal.go | 0 .../internal/xdsresource/ads_stream.go | 0 .../xdsclient/internal/xdsresource/errors.go | 0 .../xdsclient/internal/xdsresource/name.go | 0 .../xdsclient/internal/xdsresource/type.go | 0 .../xdsclient/internal/xdsresource/version.go | 0 .../xds}/clients/xdsclient/logging.go | 0 .../xds}/clients/xdsclient/metrics/metrics.go | 0 .../xds}/clients/xdsclient/resource_type.go | 0 .../clients/xdsclient/resource_watcher.go | 0 .../test/ads_stream_ack_nack_test.go | 12 +-- .../xdsclient/test/ads_stream_backoff_test.go | 14 ++-- .../test/ads_stream_flow_control_test.go | 8 +- .../xdsclient/test/ads_stream_restart_test.go | 8 +- .../xdsclient/test/ads_stream_watch_test.go | 10 +-- .../clients/xdsclient/test/authority_test.go | 12 +-- .../xds}/clients/xdsclient/test/dump_test.go | 14 ++-- .../clients/xdsclient/test/helpers_test.go | 8 +- .../xdsclient/test/lds_watchers_test.go | 16 ++-- .../clients/xdsclient/test/metrics_test.go | 12 +-- .../xdsclient/test/misc_watchers_test.go | 14 ++-- .../xds}/clients/xdsclient/xdsclient.go | 14 ++-- .../xds}/clients/xdsclient/xdsclient_test.go | 6 +- .../xds}/clients/xdsclient/xdsconfig.go | 2 +- .../clusterspecifier/cluster_specifier.go | 0 .../xds}/clusterspecifier/rls/rls.go | 2 +- .../xds}/clusterspecifier/rls/rls_test.go | 4 +- .../xds}/httpfilter/fault/fault.go | 2 +- .../xds}/httpfilter/fault/fault_test.go | 6 +- .../xds}/httpfilter/httpfilter.go | 0 .../xds}/httpfilter/rbac/rbac.go | 2 +- .../xds}/httpfilter/router/router.go | 2 +- .../resolver/cluster_specifier_plugin_test.go | 4 +- .../xds}/resolver/helpers_test.go | 4 +- .../xds}/resolver/internal/internal.go | 0 .../xds}/resolver/logging.go | 0 .../xds}/resolver/serviceconfig.go | 6 +- .../xds}/resolver/serviceconfig_test.go | 4 +- .../xds}/resolver/watch_service.go | 2 +- .../xds}/resolver/watch_service_test.go | 0 .../xds}/resolver/xds_resolver.go | 6 +- .../xds}/resolver/xds_resolver_test.go | 14 ++-- .../xds}/server/conn_wrapper.go | 2 +- .../xds}/server/listener_wrapper.go | 2 +- .../xds}/server/rds_handler.go | 2 +- .../xds}/server/rds_handler_test.go | 4 +- .../xds}/test/e2e/README.md | 0 .../xds}/test/e2e/controlplane.go | 0 .../internal => internal/xds}/test/e2e/e2e.go | 0 .../xds}/test/e2e/e2e_test.go | 0 .../xds}/test/e2e/e2e_utils.go | 0 .../internal => internal/xds}/test/e2e/run.sh | 0 .../xds}/testutils/balancer_test.go | 0 .../xds}/testutils/fakeclient/client.go | 6 +- .../xds}/testutils/resource_watcher.go | 2 +- .../xds}/testutils/testutils.go | 4 +- internal/xds/xds.go | 66 ++++++++++++++- .../xds/xds_test.go | 4 +- .../xds}/xdsclient/attributes.go | 0 .../xds}/xdsclient/client.go | 4 +- .../xds}/xdsclient/client_refcounted_test.go | 0 .../xds}/xdsclient/client_test.go | 0 .../xds}/xdsclient/clientimpl.go | 10 +-- .../xds}/xdsclient/clientimpl_loadreport.go | 6 +- .../xds}/xdsclient/clientimpl_test.go | 10 +-- .../xds}/xdsclient/clientimpl_watchers.go | 2 +- .../xds}/xdsclient/internal/internal.go | 0 .../xds}/xdsclient/logging.go | 0 .../xds}/xdsclient/metrics_test.go | 4 +- .../xds}/xdsclient/pool.go | 0 .../xds}/xdsclient/pool/pool_ext_test.go | 2 +- .../xds}/xdsclient/requests_counter.go | 0 .../xds}/xdsclient/requests_counter_test.go | 0 .../xds}/xdsclient/resource_types.go | 6 +- .../tests/ads_stream_ack_nack_test.go | 4 +- .../tests/ads_stream_restart_test.go | 6 +- .../xds}/xdsclient/tests/authority_test.go | 6 +- .../xds}/xdsclient/tests/cds_watchers_test.go | 4 +- .../tests/client_custom_dialopts_test.go | 2 +- .../xds}/xdsclient/tests/dump_test.go | 4 +- .../xds}/xdsclient/tests/eds_watchers_test.go | 6 +- .../xds}/xdsclient/tests/fallback_test.go | 4 +- .../tests/federation_watchers_test.go | 6 +- .../xds}/xdsclient/tests/helpers_test.go | 0 .../xds}/xdsclient/tests/lds_watchers_test.go | 6 +- .../xds}/xdsclient/tests/loadreport_test.go | 2 +- .../xds}/xdsclient/tests/rds_watchers_test.go | 4 +- .../xdsclient/tests/resource_update_test.go | 8 +- .../xds}/xdsclient/xdsclient_test.go | 0 .../xdslbregistry/converter/converter.go | 4 +- .../xdsclient/xdslbregistry/xdslbregistry.go | 0 .../xdslbregistry/xdslbregistry_test.go | 4 +- .../xdsresource/cluster_resource_type.go | 4 +- .../xdsresource/endpoints_resource_type.go | 4 +- .../xds}/xdsclient/xdsresource/errors.go | 0 .../xdsclient/xdsresource/filter_chain.go | 4 +- .../xdsresource/filter_chain_test.go | 6 +- .../xdsresource/listener_resource_type.go | 4 +- .../xds}/xdsclient/xdsresource/logging.go | 0 .../xds}/xdsclient/xdsresource/matcher.go | 0 .../xdsclient/xdsresource/matcher_path.go | 0 .../xdsresource/matcher_path_test.go | 0 .../xdsclient/xdsresource/matcher_test.go | 0 .../xds}/xdsclient/xdsresource/name.go | 0 .../xds}/xdsclient/xdsresource/name_test.go | 0 .../xdsclient/xdsresource/resource_type.go | 6 +- .../xdsresource/route_config_resource_type.go | 4 +- .../xdsclient/xdsresource/test_utils_test.go | 0 .../xdsresource/tests/unmarshal_cds_test.go | 34 ++++---- .../xds}/xdsclient/xdsresource/type.go | 2 +- .../xds}/xdsclient/xdsresource/type_cds.go | 0 .../xds}/xdsclient/xdsresource/type_eds.go | 2 +- .../xds}/xdsclient/xdsresource/type_lds.go | 2 +- .../xds}/xdsclient/xdsresource/type_rds.go | 4 +- .../xdsclient/xdsresource/unmarshal_cds.go | 4 +- .../xdsresource/unmarshal_cds_test.go | 26 +++--- .../xdsclient/xdsresource/unmarshal_eds.go | 6 +- .../xdsresource/unmarshal_eds_test.go | 4 +- .../xdsclient/xdsresource/unmarshal_lds.go | 2 +- .../xdsresource/unmarshal_lds_test.go | 8 +- .../xdsclient/xdsresource/unmarshal_rds.go | 2 +- .../xdsresource/unmarshal_rds_test.go | 6 +- .../xdsclient/xdsresource/version/version.go | 0 interop/observability/go.sum | 3 + xds/csds/csds.go | 2 +- xds/csds/csds_e2e_test.go | 6 +- xds/googledirectpath/googlec2p.go | 2 +- xds/googledirectpath/googlec2p_test.go | 2 +- xds/internal/internal.go | 84 ------------------- xds/server.go | 6 +- xds/server_ext_test.go | 2 +- xds/server_options.go | 2 +- xds/server_resource_ext_test.go | 4 +- xds/server_security_ext_test.go | 2 +- xds/server_serving_mode_ext_test.go | 2 +- xds/server_test.go | 6 +- xds/test/eds_resource_missing_test.go | 2 +- xds/xds.go | 14 ++-- 236 files changed, 502 insertions(+), 518 deletions(-) rename {xds/internal => internal/xds}/balancer/balancer.go (75%) rename {xds/internal => internal/xds}/balancer/cdsbalancer/aggregate_cluster_test.go (96%) rename {xds/internal => internal/xds}/balancer/cdsbalancer/cdsbalancer.go (99%) rename {xds/internal => internal/xds}/balancer/cdsbalancer/cdsbalancer_security_test.go (99%) rename {xds/internal => internal/xds}/balancer/cdsbalancer/cdsbalancer_test.go (99%) rename {xds/internal => internal/xds}/balancer/cdsbalancer/cluster_watcher.go (97%) rename {xds/internal => internal/xds}/balancer/cdsbalancer/logging.go (100%) rename {xds/internal => internal/xds}/balancer/clusterimpl/balancer_test.go (99%) rename {xds/internal => internal/xds}/balancer/clusterimpl/clusterimpl.go (97%) rename {xds/internal => internal/xds}/balancer/clusterimpl/config.go (100%) rename {xds/internal => internal/xds}/balancer/clusterimpl/config_test.go (100%) rename {xds/internal => internal/xds}/balancer/clusterimpl/logging.go (100%) rename {xds/internal => internal/xds}/balancer/clusterimpl/picker.go (95%) rename {xds/internal => internal/xds}/balancer/clusterimpl/tests/balancer_test.go (100%) rename {xds/internal => internal/xds}/balancer/clustermanager/balancerstateaggregator.go (100%) rename {xds/internal => internal/xds}/balancer/clustermanager/clustermanager.go (100%) rename {xds/internal => internal/xds}/balancer/clustermanager/clustermanager_test.go (100%) rename {xds/internal => internal/xds}/balancer/clustermanager/config.go (100%) rename {xds/internal => internal/xds}/balancer/clustermanager/config_test.go (98%) rename {xds/internal => internal/xds}/balancer/clustermanager/e2e_test/clustermanager_test.go (100%) rename {xds/internal => internal/xds}/balancer/clustermanager/picker.go (100%) rename {xds/internal => internal/xds}/balancer/clusterresolver/clusterresolver.go (98%) rename {xds/internal => internal/xds}/balancer/clusterresolver/clusterresolver_test.go (100%) rename {xds/internal => internal/xds}/balancer/clusterresolver/config.go (98%) rename {xds/internal => internal/xds}/balancer/clusterresolver/config_test.go (99%) rename {xds/internal => internal/xds}/balancer/clusterresolver/configbuilder.go (96%) rename {xds/internal => internal/xds}/balancer/clusterresolver/configbuilder_childname.go (96%) rename {xds/internal => internal/xds}/balancer/clusterresolver/configbuilder_childname_test.go (96%) rename {xds/internal => internal/xds}/balancer/clusterresolver/configbuilder_test.go (97%) rename {xds/internal => internal/xds}/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go (99%) rename {xds/internal => internal/xds}/balancer/clusterresolver/e2e_test/balancer_test.go (97%) rename {xds/internal => internal/xds}/balancer/clusterresolver/e2e_test/eds_impl_test.go (99%) rename {xds/internal => internal/xds}/balancer/clusterresolver/logging.go (100%) rename {xds/internal => internal/xds}/balancer/clusterresolver/resource_resolver.go (99%) rename {xds/internal => internal/xds}/balancer/clusterresolver/resource_resolver_dns.go (100%) rename {xds/internal => internal/xds}/balancer/clusterresolver/resource_resolver_eds.go (98%) rename {xds/internal => internal/xds}/balancer/loadstore/load_store_wrapper.go (97%) rename {xds/internal => internal/xds}/balancer/outlierdetection/balancer.go (100%) rename {xds/internal => internal/xds}/balancer/outlierdetection/balancer_test.go (99%) rename {xds/internal => internal/xds}/balancer/outlierdetection/callcounter.go (100%) rename {xds/internal => internal/xds}/balancer/outlierdetection/callcounter_test.go (100%) rename {xds/internal => internal/xds}/balancer/outlierdetection/config.go (100%) rename {xds/internal => internal/xds}/balancer/outlierdetection/config_test.go (100%) rename {xds/internal => internal/xds}/balancer/outlierdetection/e2e_test/outlierdetection_test.go (99%) rename {xds/internal => internal/xds}/balancer/outlierdetection/logging.go (100%) rename {xds/internal => internal/xds}/balancer/outlierdetection/subconn_wrapper.go (100%) rename {xds/internal => internal/xds}/balancer/priority/balancer.go (100%) rename {xds/internal => internal/xds}/balancer/priority/balancer_child.go (100%) rename {xds/internal => internal/xds}/balancer/priority/balancer_priority.go (100%) rename {xds/internal => internal/xds}/balancer/priority/balancer_test.go (100%) rename {xds/internal => internal/xds}/balancer/priority/config.go (100%) rename {xds/internal => internal/xds}/balancer/priority/config_test.go (100%) rename {xds/internal => internal/xds}/balancer/priority/ignore_resolve_now.go (100%) rename {xds/internal => internal/xds}/balancer/priority/ignore_resolve_now_test.go (100%) rename {xds/internal => internal/xds}/balancer/priority/logging.go (100%) rename {xds/internal => internal/xds}/balancer/wrrlocality/balancer.go (98%) rename {xds/internal => internal/xds}/balancer/wrrlocality/balancer_test.go (97%) rename {xds/internal => internal/xds}/balancer/wrrlocality/logging.go (100%) rename {xds/internal => internal/xds}/clients/config.go (100%) rename {xds/internal => internal/xds}/clients/grpctransport/examples_test.go (92%) rename {xds/internal => internal/xds}/clients/grpctransport/grpc_transport.go (99%) rename {xds/internal => internal/xds}/clients/grpctransport/grpc_transport_ext_test.go (98%) rename {xds/internal => internal/xds}/clients/grpctransport/grpc_transport_test.go (99%) rename {xds/internal => internal/xds}/clients/internal/backoff/backoff.go (100%) rename {xds/internal => internal/xds}/clients/internal/buffer/unbounded.go (100%) rename {xds/internal => internal/xds}/clients/internal/buffer/unbounded_test.go (100%) rename {xds/internal => internal/xds}/clients/internal/internal.go (97%) rename {xds/internal => internal/xds}/clients/internal/internal_test.go (99%) rename {xds/internal => internal/xds}/clients/internal/pretty/pretty.go (100%) rename {xds/internal => internal/xds}/clients/internal/syncutil/callback_serializer.go (98%) rename {xds/internal => internal/xds}/clients/internal/syncutil/callback_serializer_test.go (100%) rename {xds/internal => internal/xds}/clients/internal/syncutil/event.go (100%) rename {xds/internal => internal/xds}/clients/internal/syncutil/event_test.go (100%) rename {xds/internal => internal/xds}/clients/internal/testutils/channel.go (100%) rename {xds/internal => internal/xds}/clients/internal/testutils/e2e/clientresources.go (100%) rename {xds/internal => internal/xds}/clients/internal/testutils/e2e/logging.go (100%) rename {xds/internal => internal/xds}/clients/internal/testutils/e2e/server.go (99%) rename {xds/internal => internal/xds}/clients/internal/testutils/fakeserver/server.go (99%) rename {xds/internal => internal/xds}/clients/internal/testutils/marshal_any.go (100%) rename {xds/internal => internal/xds}/clients/internal/testutils/restartable_listener.go (100%) rename {xds/internal => internal/xds}/clients/internal/testutils/wrappers.go (100%) rename {xds/internal => internal/xds}/clients/lrsclient/internal/internal.go (100%) rename {xds/internal => internal/xds}/clients/lrsclient/load_store.go (99%) rename {xds/internal => internal/xds}/clients/lrsclient/load_store_test.go (99%) rename {xds/internal => internal/xds}/clients/lrsclient/loadreport_test.go (98%) rename {xds/internal => internal/xds}/clients/lrsclient/logging.go (100%) rename {xds/internal => internal/xds}/clients/lrsclient/lrs_stream.go (99%) rename {xds/internal => internal/xds}/clients/lrsclient/lrsclient.go (96%) rename {xds/internal => internal/xds}/clients/lrsclient/lrsconfig.go (95%) rename {xds/internal => internal/xds}/clients/transport_builder.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/ads_stream.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/authority.go (99%) rename {xds/internal => internal/xds}/clients/xdsclient/channel.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/channel_test.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/clientimpl_watchers.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/helpers_test.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/internal/internal.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/internal/xdsresource/ads_stream.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/internal/xdsresource/errors.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/internal/xdsresource/name.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/internal/xdsresource/type.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/internal/xdsresource/version.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/logging.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/metrics/metrics.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/resource_type.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/resource_watcher.go (100%) rename {xds/internal => internal/xds}/clients/xdsclient/test/ads_stream_ack_nack_test.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/test/ads_stream_backoff_test.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/test/ads_stream_flow_control_test.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/test/ads_stream_restart_test.go (96%) rename {xds/internal => internal/xds}/clients/xdsclient/test/ads_stream_watch_test.go (96%) rename {xds/internal => internal/xds}/clients/xdsclient/test/authority_test.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/test/dump_test.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/test/helpers_test.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/test/lds_watchers_test.go (99%) rename {xds/internal => internal/xds}/clients/xdsclient/test/metrics_test.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/test/misc_watchers_test.go (98%) rename {xds/internal => internal/xds}/clients/xdsclient/xdsclient.go (97%) rename {xds/internal => internal/xds}/clients/xdsclient/xdsclient_test.go (95%) rename {xds/internal => internal/xds}/clients/xdsclient/xdsconfig.go (98%) rename {xds/internal => internal/xds}/clusterspecifier/cluster_specifier.go (100%) rename {xds/internal => internal/xds}/clusterspecifier/rls/rls.go (98%) rename {xds/internal => internal/xds}/clusterspecifier/rls/rls_test.go (97%) rename {xds/internal => internal/xds}/httpfilter/fault/fault.go (99%) rename {xds/internal => internal/xds}/httpfilter/fault/fault_test.go (99%) rename {xds/internal => internal/xds}/httpfilter/httpfilter.go (100%) rename {xds/internal => internal/xds}/httpfilter/rbac/rbac.go (99%) rename {xds/internal => internal/xds}/httpfilter/router/router.go (98%) rename {xds/internal => internal/xds}/resolver/cluster_specifier_plugin_test.go (98%) rename {xds/internal => internal/xds}/resolver/helpers_test.go (98%) rename {xds/internal => internal/xds}/resolver/internal/internal.go (100%) rename {xds/internal => internal/xds}/resolver/logging.go (100%) rename {xds/internal => internal/xds}/resolver/serviceconfig.go (98%) rename {xds/internal => internal/xds}/resolver/serviceconfig_test.go (97%) rename {xds/internal => internal/xds}/resolver/watch_service.go (98%) rename {xds/internal => internal/xds}/resolver/watch_service_test.go (100%) rename {xds/internal => internal/xds}/resolver/xds_resolver.go (99%) rename {xds/internal => internal/xds}/resolver/xds_resolver_test.go (99%) rename {xds/internal => internal/xds}/server/conn_wrapper.go (99%) rename {xds/internal => internal/xds}/server/listener_wrapper.go (99%) rename {xds/internal => internal/xds}/server/rds_handler.go (98%) rename {xds/internal => internal/xds}/server/rds_handler_test.go (98%) rename {xds/internal => internal/xds}/test/e2e/README.md (100%) rename {xds/internal => internal/xds}/test/e2e/controlplane.go (100%) rename {xds/internal => internal/xds}/test/e2e/e2e.go (100%) rename {xds/internal => internal/xds}/test/e2e/e2e_test.go (100%) rename {xds/internal => internal/xds}/test/e2e/e2e_utils.go (100%) rename {xds/internal => internal/xds}/test/e2e/run.sh (100%) rename {xds/internal => internal/xds}/testutils/balancer_test.go (100%) rename {xds/internal => internal/xds}/testutils/fakeclient/client.go (96%) rename {xds/internal => internal/xds}/testutils/resource_watcher.go (97%) rename {xds/internal => internal/xds}/testutils/testutils.go (92%) rename xds/internal/internal_test.go => internal/xds/xds_test.go (97%) rename {xds/internal => internal/xds}/xdsclient/attributes.go (100%) rename {xds/internal => internal/xds}/xdsclient/client.go (95%) rename {xds/internal => internal/xds}/xdsclient/client_refcounted_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/client_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/clientimpl.go (96%) rename {xds/internal => internal/xds}/xdsclient/clientimpl_loadreport.go (91%) rename {xds/internal => internal/xds}/xdsclient/clientimpl_test.go (98%) rename {xds/internal => internal/xds}/xdsclient/clientimpl_watchers.go (95%) rename {xds/internal => internal/xds}/xdsclient/internal/internal.go (100%) rename {xds/internal => internal/xds}/xdsclient/logging.go (100%) rename {xds/internal => internal/xds}/xdsclient/metrics_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/pool.go (100%) rename {xds/internal => internal/xds}/xdsclient/pool/pool_ext_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/requests_counter.go (100%) rename {xds/internal => internal/xds}/xdsclient/requests_counter_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/resource_types.go (91%) rename {xds/internal => internal/xds}/xdsclient/tests/ads_stream_ack_nack_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/ads_stream_restart_test.go (97%) rename {xds/internal => internal/xds}/xdsclient/tests/authority_test.go (98%) rename {xds/internal => internal/xds}/xdsclient/tests/cds_watchers_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/client_custom_dialopts_test.go (98%) rename {xds/internal => internal/xds}/xdsclient/tests/dump_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/eds_watchers_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/fallback_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/federation_watchers_test.go (98%) rename {xds/internal => internal/xds}/xdsclient/tests/helpers_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/tests/lds_watchers_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/loadreport_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/rds_watchers_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/tests/resource_update_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsclient_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdslbregistry/converter/converter.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdslbregistry/xdslbregistry.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdslbregistry/xdslbregistry_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/cluster_resource_type.go (97%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/endpoints_resource_type.go (97%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/errors.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/filter_chain.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/filter_chain_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/listener_resource_type.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/logging.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/matcher.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/matcher_path.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/matcher_path_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/matcher_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/name.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/name_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/resource_type.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/route_config_resource_type.go (97%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/test_utils_test.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/tests/unmarshal_cds_test.go (95%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/type.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/type_cds.go (100%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/type_eds.go (97%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/type_lds.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/type_rds.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_cds.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_cds_test.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_eds.go (98%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_eds_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_lds.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_lds_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_rds.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/unmarshal_rds_test.go (99%) rename {xds/internal => internal/xds}/xdsclient/xdsresource/version/version.go (100%) delete mode 100644 xds/internal/internal.go diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 33b0c691d..7440e36c3 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -125,7 +125,7 @@ jobs: echo -e "\n-- Running Interop Test --" interop/interop_test.sh echo -e "\n-- Running xDS E2E Test --" - xds/internal/test/e2e/run.sh + internal/xds/test/e2e/run.sh echo -e "\n-- Running protoc-gen-go-grpc test --" ./scripts/vet-proto.sh -install cmd/protoc-gen-go-grpc/protoc-gen-go-grpc_test.sh diff --git a/gcp/observability/go.sum b/gcp/observability/go.sum index b94f7cf9a..6615a0b8d 100644 --- a/gcp/observability/go.sum +++ b/gcp/observability/go.sum @@ -892,6 +892,7 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls= github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -918,9 +919,11 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= +github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA= github.com/envoyproxy/go-control-plane/envoy v1.32.2/go.mod h1:eR2SOX2IedqlPvmiKjUH7Wu//S602JKI7HPC/L3SRq8= github.com/envoyproxy/go-control-plane/envoy v1.32.3/go.mod h1:F6hWupPfh75TBXGKA++MCT/CZHFq5r9/uwt/kQYkZfE= +github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A= github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw= github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -929,6 +932,7 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= +github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= github.com/esiqveland/notify v0.11.0/go.mod h1:63UbVSaeJwF0LVJARHFuPgUAoM7o1BEvCZyknsuonBc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -1253,6 +1257,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= diff --git a/xds/internal/balancer/balancer.go b/internal/xds/balancer/balancer.go similarity index 75% rename from xds/internal/balancer/balancer.go rename to internal/xds/balancer/balancer.go index ff27af026..af3f999a1 100644 --- a/xds/internal/balancer/balancer.go +++ b/internal/xds/balancer/balancer.go @@ -22,10 +22,10 @@ package balancer import ( _ "google.golang.org/grpc/balancer/leastrequest" // Register the least_request_experimental balancer _ "google.golang.org/grpc/balancer/weightedtarget" // Register the weighted_target balancer - _ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" // Register the CDS balancer - _ "google.golang.org/grpc/xds/internal/balancer/clusterimpl" // Register the xds_cluster_impl balancer - _ "google.golang.org/grpc/xds/internal/balancer/clustermanager" // Register the xds_cluster_manager balancer - _ "google.golang.org/grpc/xds/internal/balancer/clusterresolver" // Register the xds_cluster_resolver balancer - _ "google.golang.org/grpc/xds/internal/balancer/outlierdetection" // Register the outlier_detection balancer - _ "google.golang.org/grpc/xds/internal/balancer/priority" // Register the priority balancer + _ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" // Register the CDS balancer + _ "google.golang.org/grpc/internal/xds/balancer/clusterimpl" // Register the xds_cluster_impl balancer + _ "google.golang.org/grpc/internal/xds/balancer/clustermanager" // Register the xds_cluster_manager balancer + _ "google.golang.org/grpc/internal/xds/balancer/clusterresolver" // Register the xds_cluster_resolver balancer + _ "google.golang.org/grpc/internal/xds/balancer/outlierdetection" // Register the outlier_detection balancer + _ "google.golang.org/grpc/internal/xds/balancer/priority" // Register the priority balancer ) diff --git a/xds/internal/balancer/cdsbalancer/aggregate_cluster_test.go b/internal/xds/balancer/cdsbalancer/aggregate_cluster_test.go similarity index 96% rename from xds/internal/balancer/cdsbalancer/aggregate_cluster_test.go rename to internal/xds/balancer/cdsbalancer/aggregate_cluster_test.go index 4db998b4c..581f511ba 100644 --- a/xds/internal/balancer/cdsbalancer/aggregate_cluster_test.go +++ b/internal/xds/balancer/cdsbalancer/aggregate_cluster_test.go @@ -31,11 +31,11 @@ import ( "google.golang.org/grpc/internal/stubserver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/clusterresolver" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/clusterresolver" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" @@ -88,7 +88,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), }, @@ -98,7 +98,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName + "-new", OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), }, @@ -113,7 +113,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS, DNSHostname: "dns_host:8080", OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), }, @@ -123,7 +123,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS, DNSHostname: "dns_host_new:8080", OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), }, @@ -218,14 +218,14 @@ func (s) TestAggregateClusterSuccess_ThenUpdateChildClusters(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, { Cluster: dnsClusterName, Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS, DNSHostname: fmt.Sprintf("%s:%d", dnsHostName, dnsPort), OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), @@ -256,14 +256,14 @@ func (s) TestAggregateClusterSuccess_ThenUpdateChildClusters(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, { Cluster: dnsClusterNameNew, Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS, DNSHostname: fmt.Sprintf("%s:%d", dnsHostNameNew, dnsPort), OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), @@ -309,14 +309,14 @@ func (s) TestAggregateClusterSuccess_ThenChangeRootToEDS(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, { Cluster: dnsClusterName, Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS, DNSHostname: fmt.Sprintf("%s:%d", dnsHostName, dnsPort), OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), @@ -342,7 +342,7 @@ func (s) TestAggregateClusterSuccess_ThenChangeRootToEDS(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), } @@ -377,7 +377,7 @@ func (s) TestAggregatedClusterSuccess_SwitchBetweenLeafAndAggregate(t *testing.T Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), } @@ -406,14 +406,14 @@ func (s) TestAggregatedClusterSuccess_SwitchBetweenLeafAndAggregate(t *testing.T Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, { Cluster: dnsClusterName, Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS, DNSHostname: fmt.Sprintf("%s:%d", dnsHostName, dnsPort), OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), @@ -437,7 +437,7 @@ func (s) TestAggregatedClusterSuccess_SwitchBetweenLeafAndAggregate(t *testing.T Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), } @@ -590,7 +590,7 @@ func (s) TestAggregatedClusterSuccess_DiamondDependency(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), } @@ -658,14 +658,14 @@ func (s) TestAggregatedClusterSuccess_IgnoreDups(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, { Cluster: clusterNameD, Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), @@ -748,7 +748,7 @@ func (s) TestAggregatedCluster_NodeChildOfItself(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), } @@ -854,7 +854,7 @@ func (s) TestAggregatedCluster_CycleWithLeafNode(t *testing.T) { Type: clusterresolver.DiscoveryMechanismTypeEDS, EDSServiceName: serviceName, OutlierDetection: json.RawMessage(`{}`), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }}, XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`), } diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer.go b/internal/xds/balancer/cdsbalancer/cdsbalancer.go similarity index 99% rename from xds/internal/balancer/cdsbalancer/cdsbalancer.go rename to internal/xds/balancer/cdsbalancer/cdsbalancer.go index b413b8acd..0ad77b85e 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer.go +++ b/internal/xds/balancer/cdsbalancer/cdsbalancer.go @@ -35,11 +35,11 @@ import ( "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/internal/pretty" + "google.golang.org/grpc/internal/xds/balancer/clusterresolver" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal/balancer/clusterresolver" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) const ( diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go b/internal/xds/balancer/cdsbalancer/cdsbalancer_security_test.go similarity index 99% rename from xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go rename to internal/xds/balancer/cdsbalancer/cdsbalancer_security_test.go index 2df4fbf52..401a16dce 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go +++ b/internal/xds/balancer/cdsbalancer/cdsbalancer_security_test.go @@ -45,12 +45,12 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/testdata" - "google.golang.org/grpc/xds/internal/xdsclient" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/internal/xds/balancer/cdsbalancer/cdsbalancer_test.go similarity index 99% rename from xds/internal/balancer/cdsbalancer/cdsbalancer_test.go rename to internal/xds/balancer/cdsbalancer/cdsbalancer_test.go index ac2324628..ca13655d4 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go +++ b/internal/xds/balancer/cdsbalancer/cdsbalancer_test.go @@ -39,16 +39,16 @@ import ( "google.golang.org/grpc/internal/stubserver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/clusterresolver" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - xdsinternal "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/clusterresolver" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/xds/internal/balancer/cdsbalancer/cluster_watcher.go b/internal/xds/balancer/cdsbalancer/cluster_watcher.go similarity index 97% rename from xds/internal/balancer/cdsbalancer/cluster_watcher.go rename to internal/xds/balancer/cdsbalancer/cluster_watcher.go index a9adea0c8..dd702b125 100644 --- a/xds/internal/balancer/cdsbalancer/cluster_watcher.go +++ b/internal/xds/balancer/cdsbalancer/cluster_watcher.go @@ -19,7 +19,7 @@ package cdsbalancer import ( "context" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) // clusterWatcher implements the xdsresource.ClusterWatcher interface, and is diff --git a/xds/internal/balancer/cdsbalancer/logging.go b/internal/xds/balancer/cdsbalancer/logging.go similarity index 100% rename from xds/internal/balancer/cdsbalancer/logging.go rename to internal/xds/balancer/cdsbalancer/logging.go diff --git a/xds/internal/balancer/clusterimpl/balancer_test.go b/internal/xds/balancer/clusterimpl/balancer_test.go similarity index 99% rename from xds/internal/balancer/clusterimpl/balancer_test.go rename to internal/xds/balancer/clusterimpl/balancer_test.go index 454ed9313..53f2debf7 100644 --- a/xds/internal/balancer/clusterimpl/balancer_test.go +++ b/internal/xds/balancer/clusterimpl/balancer_test.go @@ -38,14 +38,13 @@ import ( "google.golang.org/grpc/internal/grpctest" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/testutils" - "google.golang.org/grpc/internal/xds" + xdsinternal "google.golang.org/grpc/internal/xds" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/testutils/fakeclient" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - xdsinternal "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/testutils/fakeclient" - "google.golang.org/grpc/xds/internal/xdsclient" v3orcapb "github.com/cncf/xds/go/xds/data/orca/v3" "github.com/google/go-cmp/cmp" @@ -729,7 +728,7 @@ func (s) TestClusterNameInAddressAttributes(t *testing.T) { if got, want := addrs1[0].Addr, testBackendEndpoints[0].Addresses[0].Addr; got != want { t.Fatalf("sc is created with addr %v, want %v", got, want) } - cn, ok := xds.GetXDSHandshakeClusterName(addrs1[0].Attributes) + cn, ok := xdsinternal.GetXDSHandshakeClusterName(addrs1[0].Attributes) if !ok || cn != testClusterName { t.Fatalf("sc is created with addr with cluster name %v, %v, want cluster name %v", cn, ok, testClusterName) } @@ -760,7 +759,7 @@ func (s) TestClusterNameInAddressAttributes(t *testing.T) { t.Fatalf("sc is created with addr %v, want %v", got, want) } // New addresses should have the new cluster name. - cn2, ok := xds.GetXDSHandshakeClusterName(addrs2[0].Attributes) + cn2, ok := xdsinternal.GetXDSHandshakeClusterName(addrs2[0].Attributes) if !ok || cn2 != testClusterName2 { t.Fatalf("sc is created with addr with cluster name %v, %v, want cluster name %v", cn2, ok, testClusterName2) } diff --git a/xds/internal/balancer/clusterimpl/clusterimpl.go b/internal/xds/balancer/clusterimpl/clusterimpl.go similarity index 97% rename from xds/internal/balancer/clusterimpl/clusterimpl.go rename to internal/xds/balancer/clusterimpl/clusterimpl.go index 006be4c4e..ffe0a3db5 100644 --- a/xds/internal/balancer/clusterimpl/clusterimpl.go +++ b/internal/xds/balancer/clusterimpl/clusterimpl.go @@ -38,15 +38,14 @@ import ( "google.golang.org/grpc/internal/balancer/gracefulswitch" "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/pretty" - "google.golang.org/grpc/internal/xds" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/loadstore" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/lrsclient" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - xdsinternal "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/loadstore" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/lrsclient" - "google.golang.org/grpc/xds/internal/xdsclient" ) const ( @@ -436,7 +435,7 @@ func (b *clusterImplBalancer) NewSubConn(addrs []resolver.Address, opts balancer clusterName := b.getClusterName() newAddrs := make([]resolver.Address, len(addrs)) for i, addr := range addrs { - newAddrs[i] = xds.SetXDSHandshakeClusterName(addr, clusterName) + newAddrs[i] = xdsinternal.SetXDSHandshakeClusterName(addr, clusterName) } var sc balancer.SubConn scw := &scWrapper{} @@ -475,7 +474,7 @@ func (b *clusterImplBalancer) UpdateAddresses(sc balancer.SubConn, addrs []resol newAddrs := make([]resolver.Address, len(addrs)) var lID clients.Locality for i, addr := range addrs { - newAddrs[i] = xds.SetXDSHandshakeClusterName(addr, clusterName) + newAddrs[i] = xdsinternal.SetXDSHandshakeClusterName(addr, clusterName) lID = xdsinternal.GetLocalityID(newAddrs[i]) } if scw, ok := sc.(*scWrapper); ok { diff --git a/xds/internal/balancer/clusterimpl/config.go b/internal/xds/balancer/clusterimpl/config.go similarity index 100% rename from xds/internal/balancer/clusterimpl/config.go rename to internal/xds/balancer/clusterimpl/config.go diff --git a/xds/internal/balancer/clusterimpl/config_test.go b/internal/xds/balancer/clusterimpl/config_test.go similarity index 100% rename from xds/internal/balancer/clusterimpl/config_test.go rename to internal/xds/balancer/clusterimpl/config_test.go diff --git a/xds/internal/balancer/clusterimpl/logging.go b/internal/xds/balancer/clusterimpl/logging.go similarity index 100% rename from xds/internal/balancer/clusterimpl/logging.go rename to internal/xds/balancer/clusterimpl/logging.go diff --git a/xds/internal/balancer/clusterimpl/picker.go b/internal/xds/balancer/clusterimpl/picker.go similarity index 95% rename from xds/internal/balancer/clusterimpl/picker.go rename to internal/xds/balancer/clusterimpl/picker.go index 9ed16ffbe..fab09fa09 100644 --- a/xds/internal/balancer/clusterimpl/picker.go +++ b/internal/xds/balancer/clusterimpl/picker.go @@ -27,10 +27,10 @@ import ( "google.golang.org/grpc/connectivity" "google.golang.org/grpc/internal/stats" "google.golang.org/grpc/internal/wrr" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient" ) // NewRandomWRR is used when calculating drops. It's exported so that tests can @@ -155,7 +155,7 @@ func (d *picker) Pick(info balancer.PickInfo) (balancer.PickResult, error) { } if labels := telemetryLabels(info.Ctx); labels != nil { - labels["grpc.lb.locality"] = internal.LocalityString(lID) + labels["grpc.lb.locality"] = xdsinternal.LocalityString(lID) } if d.loadStore != nil { diff --git a/xds/internal/balancer/clusterimpl/tests/balancer_test.go b/internal/xds/balancer/clusterimpl/tests/balancer_test.go similarity index 100% rename from xds/internal/balancer/clusterimpl/tests/balancer_test.go rename to internal/xds/balancer/clusterimpl/tests/balancer_test.go diff --git a/xds/internal/balancer/clustermanager/balancerstateaggregator.go b/internal/xds/balancer/clustermanager/balancerstateaggregator.go similarity index 100% rename from xds/internal/balancer/clustermanager/balancerstateaggregator.go rename to internal/xds/balancer/clustermanager/balancerstateaggregator.go diff --git a/xds/internal/balancer/clustermanager/clustermanager.go b/internal/xds/balancer/clustermanager/clustermanager.go similarity index 100% rename from xds/internal/balancer/clustermanager/clustermanager.go rename to internal/xds/balancer/clustermanager/clustermanager.go diff --git a/xds/internal/balancer/clustermanager/clustermanager_test.go b/internal/xds/balancer/clustermanager/clustermanager_test.go similarity index 100% rename from xds/internal/balancer/clustermanager/clustermanager_test.go rename to internal/xds/balancer/clustermanager/clustermanager_test.go diff --git a/xds/internal/balancer/clustermanager/config.go b/internal/xds/balancer/clustermanager/config.go similarity index 100% rename from xds/internal/balancer/clustermanager/config.go rename to internal/xds/balancer/clustermanager/config.go diff --git a/xds/internal/balancer/clustermanager/config_test.go b/internal/xds/balancer/clustermanager/config_test.go similarity index 98% rename from xds/internal/balancer/clustermanager/config_test.go rename to internal/xds/balancer/clustermanager/config_test.go index ef496a2e0..fd815dfa1 100644 --- a/xds/internal/balancer/clustermanager/config_test.go +++ b/internal/xds/balancer/clustermanager/config_test.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/balancer" _ "google.golang.org/grpc/balancer/weightedtarget" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" - _ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" + _ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" ) const ( diff --git a/xds/internal/balancer/clustermanager/e2e_test/clustermanager_test.go b/internal/xds/balancer/clustermanager/e2e_test/clustermanager_test.go similarity index 100% rename from xds/internal/balancer/clustermanager/e2e_test/clustermanager_test.go rename to internal/xds/balancer/clustermanager/e2e_test/clustermanager_test.go diff --git a/xds/internal/balancer/clustermanager/picker.go b/internal/xds/balancer/clustermanager/picker.go similarity index 100% rename from xds/internal/balancer/clustermanager/picker.go rename to internal/xds/balancer/clustermanager/picker.go diff --git a/xds/internal/balancer/clusterresolver/clusterresolver.go b/internal/xds/balancer/clusterresolver/clusterresolver.go similarity index 98% rename from xds/internal/balancer/clusterresolver/clusterresolver.go rename to internal/xds/balancer/clusterresolver/clusterresolver.go index f9ce57293..f5a30e1ac 100644 --- a/xds/internal/balancer/clusterresolver/clusterresolver.go +++ b/internal/xds/balancer/clusterresolver/clusterresolver.go @@ -35,12 +35,12 @@ import ( "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/internal/pretty" + "google.golang.org/grpc/internal/xds/balancer/outlierdetection" + "google.golang.org/grpc/internal/xds/balancer/priority" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal/balancer/outlierdetection" - "google.golang.org/grpc/xds/internal/balancer/priority" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) // Name is the name of the cluster_resolver balancer. diff --git a/xds/internal/balancer/clusterresolver/clusterresolver_test.go b/internal/xds/balancer/clusterresolver/clusterresolver_test.go similarity index 100% rename from xds/internal/balancer/clusterresolver/clusterresolver_test.go rename to internal/xds/balancer/clusterresolver/clusterresolver_test.go diff --git a/xds/internal/balancer/clusterresolver/config.go b/internal/xds/balancer/clusterresolver/config.go similarity index 98% rename from xds/internal/balancer/clusterresolver/config.go rename to internal/xds/balancer/clusterresolver/config.go index 7614b0fc5..f3b4c6bf6 100644 --- a/xds/internal/balancer/clusterresolver/config.go +++ b/internal/xds/balancer/clusterresolver/config.go @@ -23,9 +23,9 @@ import ( "fmt" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" + "google.golang.org/grpc/internal/xds/balancer/outlierdetection" "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal/balancer/outlierdetection" ) // DiscoveryMechanismType is the type of discovery mechanism. diff --git a/xds/internal/balancer/clusterresolver/config_test.go b/internal/xds/balancer/clusterresolver/config_test.go similarity index 99% rename from xds/internal/balancer/clusterresolver/config_test.go rename to internal/xds/balancer/clusterresolver/config_test.go index 79c135a63..964359aaf 100644 --- a/xds/internal/balancer/clusterresolver/config_test.go +++ b/internal/xds/balancer/clusterresolver/config_test.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc/balancer/roundrobin" iringhash "google.golang.org/grpc/internal/ringhash" iserviceconfig "google.golang.org/grpc/internal/serviceconfig" + "google.golang.org/grpc/internal/xds/balancer/outlierdetection" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/balancer/outlierdetection" ) func TestDiscoveryMechanismTypeMarshalJSON(t *testing.T) { diff --git a/xds/internal/balancer/clusterresolver/configbuilder.go b/internal/xds/balancer/clusterresolver/configbuilder.go similarity index 96% rename from xds/internal/balancer/clusterresolver/configbuilder.go rename to internal/xds/balancer/clusterresolver/configbuilder.go index 9c7fed862..3d8e08972 100644 --- a/xds/internal/balancer/clusterresolver/configbuilder.go +++ b/internal/xds/balancer/clusterresolver/configbuilder.go @@ -26,14 +26,14 @@ import ( "google.golang.org/grpc/internal/balancer/weight" "google.golang.org/grpc/internal/hierarchy" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/clusterimpl" + "google.golang.org/grpc/internal/xds/balancer/outlierdetection" + "google.golang.org/grpc/internal/xds/balancer/priority" + "google.golang.org/grpc/internal/xds/balancer/wrrlocality" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/ringhash" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/clusterimpl" - "google.golang.org/grpc/xds/internal/balancer/outlierdetection" - "google.golang.org/grpc/xds/internal/balancer/priority" - "google.golang.org/grpc/xds/internal/balancer/wrrlocality" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) const million = 1000000 @@ -257,7 +257,7 @@ func priorityLocalitiesToClusterImpl(localities []xdsresource.Locality, priority if locality.Weight != 0 { lw = locality.Weight } - localityStr := internal.LocalityString(locality.ID) + localityStr := xdsinternal.LocalityString(locality.ID) for _, endpoint := range locality.Endpoints { // Filter out all "unhealthy" endpoints (unknown and healthy are // both considered to be healthy: @@ -270,7 +270,7 @@ func priorityLocalitiesToClusterImpl(localities []xdsresource.Locality, priority resolverEndpoint.Addresses = append(resolverEndpoint.Addresses, resolver.Address{Addr: as}) } resolverEndpoint = hierarchy.SetInEndpoint(resolverEndpoint, []string{priorityName, localityStr}) - resolverEndpoint = internal.SetLocalityIDInEndpoint(resolverEndpoint, locality.ID) + resolverEndpoint = xdsinternal.SetLocalityIDInEndpoint(resolverEndpoint, locality.ID) // "To provide the xds_wrr_locality load balancer information about // locality weights received from EDS, the cluster resolver will // populate a new locality weight attribute for each address The diff --git a/xds/internal/balancer/clusterresolver/configbuilder_childname.go b/internal/xds/balancer/clusterresolver/configbuilder_childname.go similarity index 96% rename from xds/internal/balancer/clusterresolver/configbuilder_childname.go rename to internal/xds/balancer/clusterresolver/configbuilder_childname.go index bf4e33496..296ed740e 100644 --- a/xds/internal/balancer/clusterresolver/configbuilder_childname.go +++ b/internal/xds/balancer/clusterresolver/configbuilder_childname.go @@ -20,8 +20,8 @@ package clusterresolver import ( "fmt" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) // nameGenerator generates a child name for a list of priorities (each priority diff --git a/xds/internal/balancer/clusterresolver/configbuilder_childname_test.go b/internal/xds/balancer/clusterresolver/configbuilder_childname_test.go similarity index 96% rename from xds/internal/balancer/clusterresolver/configbuilder_childname_test.go rename to internal/xds/balancer/clusterresolver/configbuilder_childname_test.go index f056b6bda..c5abcd8fe 100644 --- a/xds/internal/balancer/clusterresolver/configbuilder_childname_test.go +++ b/internal/xds/balancer/clusterresolver/configbuilder_childname_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) func Test_nameGenerator_generate(t *testing.T) { diff --git a/xds/internal/balancer/clusterresolver/configbuilder_test.go b/internal/xds/balancer/clusterresolver/configbuilder_test.go similarity index 97% rename from xds/internal/balancer/clusterresolver/configbuilder_test.go rename to internal/xds/balancer/clusterresolver/configbuilder_test.go index 656596f95..571b75648 100644 --- a/xds/internal/balancer/clusterresolver/configbuilder_test.go +++ b/internal/xds/balancer/clusterresolver/configbuilder_test.go @@ -35,15 +35,15 @@ import ( "google.golang.org/grpc/internal/hierarchy" iringhash "google.golang.org/grpc/internal/ringhash" iserviceconfig "google.golang.org/grpc/internal/serviceconfig" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/clusterimpl" + "google.golang.org/grpc/internal/xds/balancer/outlierdetection" + "google.golang.org/grpc/internal/xds/balancer/priority" + "google.golang.org/grpc/internal/xds/balancer/wrrlocality" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/resolver" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/clusterimpl" - "google.golang.org/grpc/xds/internal/balancer/outlierdetection" - "google.golang.org/grpc/xds/internal/balancer/priority" - "google.golang.org/grpc/xds/internal/balancer/wrrlocality" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) const ( @@ -642,8 +642,8 @@ func testEndpointWithAttrs(addrStrs []string, localityWeight, endpointWeight uin } path := []string{priority} if lID != nil { - path = append(path, internal.LocalityString(*lID)) - endpoint = internal.SetLocalityIDInEndpoint(endpoint, *lID) + path = append(path, xdsinternal.LocalityString(*lID)) + endpoint = xdsinternal.SetLocalityIDInEndpoint(endpoint, *lID) } endpoint = hierarchy.SetInEndpoint(endpoint, path) endpoint = wrrlocality.SetAddrInfoInEndpoint(endpoint, wrrlocality.AddrInfo{LocalityWeight: localityWeight}) diff --git a/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go b/internal/xds/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go similarity index 99% rename from xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go rename to internal/xds/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go index 36d22abfa..523b5259e 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go +++ b/internal/xds/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go @@ -37,13 +37,13 @@ import ( "google.golang.org/grpc/internal/testutils/pickfirst" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/wrapperspb" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" diff --git a/xds/internal/balancer/clusterresolver/e2e_test/balancer_test.go b/internal/xds/balancer/clusterresolver/e2e_test/balancer_test.go similarity index 97% rename from xds/internal/balancer/clusterresolver/e2e_test/balancer_test.go rename to internal/xds/balancer/clusterresolver/e2e_test/balancer_test.go index 8e7f3d1fd..50801330e 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/balancer_test.go +++ b/internal/xds/balancer/clusterresolver/e2e_test/balancer_test.go @@ -38,18 +38,18 @@ import ( "google.golang.org/grpc/internal/stubserver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/clusterimpl" + "google.golang.org/grpc/internal/xds/balancer/outlierdetection" + "google.golang.org/grpc/internal/xds/balancer/priority" + "google.golang.org/grpc/internal/xds/balancer/wrrlocality" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - xdsinternal "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/clusterimpl" - "google.golang.org/grpc/xds/internal/balancer/outlierdetection" - "google.golang.org/grpc/xds/internal/balancer/priority" - "google.golang.org/grpc/xds/internal/balancer/wrrlocality" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" @@ -60,7 +60,7 @@ import ( testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" - _ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" // Register the "cds_experimental" LB policy. + _ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" // Register the "cds_experimental" LB policy. ) // setupAndDial performs common setup across all tests diff --git a/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go b/internal/xds/balancer/clusterresolver/e2e_test/eds_impl_test.go similarity index 99% rename from xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go rename to internal/xds/balancer/clusterresolver/e2e_test/eds_impl_test.go index dfcb793dd..477601ecd 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go +++ b/internal/xds/balancer/clusterresolver/e2e_test/eds_impl_test.go @@ -41,13 +41,13 @@ import ( rrutil "google.golang.org/grpc/internal/testutils/roundrobin" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/wrapperspb" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" @@ -57,8 +57,8 @@ import ( testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" - _ "google.golang.org/grpc/xds/internal/balancer/clusterresolver" // Register the "cluster_resolver_experimental" LB policy. - "google.golang.org/grpc/xds/internal/balancer/priority" + _ "google.golang.org/grpc/internal/xds/balancer/clusterresolver" // Register the "cluster_resolver_experimental" LB policy. + "google.golang.org/grpc/internal/xds/balancer/priority" ) const ( diff --git a/xds/internal/balancer/clusterresolver/logging.go b/internal/xds/balancer/clusterresolver/logging.go similarity index 100% rename from xds/internal/balancer/clusterresolver/logging.go rename to internal/xds/balancer/clusterresolver/logging.go diff --git a/xds/internal/balancer/clusterresolver/resource_resolver.go b/internal/xds/balancer/clusterresolver/resource_resolver.go similarity index 99% rename from xds/internal/balancer/clusterresolver/resource_resolver.go rename to internal/xds/balancer/clusterresolver/resource_resolver.go index c1a656c59..90e950c73 100644 --- a/xds/internal/balancer/clusterresolver/resource_resolver.go +++ b/internal/xds/balancer/clusterresolver/resource_resolver.go @@ -24,8 +24,8 @@ import ( "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/resolver" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) // resourceUpdate is a combined update from all the resources, in the order of diff --git a/xds/internal/balancer/clusterresolver/resource_resolver_dns.go b/internal/xds/balancer/clusterresolver/resource_resolver_dns.go similarity index 100% rename from xds/internal/balancer/clusterresolver/resource_resolver_dns.go rename to internal/xds/balancer/clusterresolver/resource_resolver_dns.go diff --git a/xds/internal/balancer/clusterresolver/resource_resolver_eds.go b/internal/xds/balancer/clusterresolver/resource_resolver_eds.go similarity index 98% rename from xds/internal/balancer/clusterresolver/resource_resolver_eds.go rename to internal/xds/balancer/clusterresolver/resource_resolver_eds.go index 043def950..18b517f11 100644 --- a/xds/internal/balancer/clusterresolver/resource_resolver_eds.go +++ b/internal/xds/balancer/clusterresolver/resource_resolver_eds.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) type edsDiscoveryMechanism struct { diff --git a/xds/internal/balancer/loadstore/load_store_wrapper.go b/internal/xds/balancer/loadstore/load_store_wrapper.go similarity index 97% rename from xds/internal/balancer/loadstore/load_store_wrapper.go rename to internal/xds/balancer/loadstore/load_store_wrapper.go index 48a2b7d1e..89d5ad875 100644 --- a/xds/internal/balancer/loadstore/load_store_wrapper.go +++ b/internal/xds/balancer/loadstore/load_store_wrapper.go @@ -22,8 +22,8 @@ package loadstore import ( "sync" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/lrsclient" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/lrsclient" ) // NewWrapper creates a Wrapper. diff --git a/xds/internal/balancer/outlierdetection/balancer.go b/internal/xds/balancer/outlierdetection/balancer.go similarity index 100% rename from xds/internal/balancer/outlierdetection/balancer.go rename to internal/xds/balancer/outlierdetection/balancer.go diff --git a/xds/internal/balancer/outlierdetection/balancer_test.go b/internal/xds/balancer/outlierdetection/balancer_test.go similarity index 99% rename from xds/internal/balancer/outlierdetection/balancer_test.go rename to internal/xds/balancer/outlierdetection/balancer_test.go index 25b6a2215..be3f03cdc 100644 --- a/xds/internal/balancer/outlierdetection/balancer_test.go +++ b/internal/xds/balancer/outlierdetection/balancer_test.go @@ -46,12 +46,12 @@ import ( "google.golang.org/grpc/internal/stubserver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/roundrobin" + "google.golang.org/grpc/internal/xds/balancer/clusterimpl" "google.golang.org/grpc/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/balancer/clusterimpl" testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" diff --git a/xds/internal/balancer/outlierdetection/callcounter.go b/internal/xds/balancer/outlierdetection/callcounter.go similarity index 100% rename from xds/internal/balancer/outlierdetection/callcounter.go rename to internal/xds/balancer/outlierdetection/callcounter.go diff --git a/xds/internal/balancer/outlierdetection/callcounter_test.go b/internal/xds/balancer/outlierdetection/callcounter_test.go similarity index 100% rename from xds/internal/balancer/outlierdetection/callcounter_test.go rename to internal/xds/balancer/outlierdetection/callcounter_test.go diff --git a/xds/internal/balancer/outlierdetection/config.go b/internal/xds/balancer/outlierdetection/config.go similarity index 100% rename from xds/internal/balancer/outlierdetection/config.go rename to internal/xds/balancer/outlierdetection/config.go diff --git a/xds/internal/balancer/outlierdetection/config_test.go b/internal/xds/balancer/outlierdetection/config_test.go similarity index 100% rename from xds/internal/balancer/outlierdetection/config_test.go rename to internal/xds/balancer/outlierdetection/config_test.go diff --git a/xds/internal/balancer/outlierdetection/e2e_test/outlierdetection_test.go b/internal/xds/balancer/outlierdetection/e2e_test/outlierdetection_test.go similarity index 99% rename from xds/internal/balancer/outlierdetection/e2e_test/outlierdetection_test.go rename to internal/xds/balancer/outlierdetection/e2e_test/outlierdetection_test.go index 161c364d9..51a3013df 100644 --- a/xds/internal/balancer/outlierdetection/e2e_test/outlierdetection_test.go +++ b/internal/xds/balancer/outlierdetection/e2e_test/outlierdetection_test.go @@ -42,7 +42,7 @@ import ( testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" - _ "google.golang.org/grpc/xds/internal/balancer/outlierdetection" // To register helper functions which register/unregister Outlier Detection LB Policy. + _ "google.golang.org/grpc/internal/xds/balancer/outlierdetection" // To register helper functions which register/unregister Outlier Detection LB Policy. ) var ( diff --git a/xds/internal/balancer/outlierdetection/logging.go b/internal/xds/balancer/outlierdetection/logging.go similarity index 100% rename from xds/internal/balancer/outlierdetection/logging.go rename to internal/xds/balancer/outlierdetection/logging.go diff --git a/xds/internal/balancer/outlierdetection/subconn_wrapper.go b/internal/xds/balancer/outlierdetection/subconn_wrapper.go similarity index 100% rename from xds/internal/balancer/outlierdetection/subconn_wrapper.go rename to internal/xds/balancer/outlierdetection/subconn_wrapper.go diff --git a/xds/internal/balancer/priority/balancer.go b/internal/xds/balancer/priority/balancer.go similarity index 100% rename from xds/internal/balancer/priority/balancer.go rename to internal/xds/balancer/priority/balancer.go diff --git a/xds/internal/balancer/priority/balancer_child.go b/internal/xds/balancer/priority/balancer_child.go similarity index 100% rename from xds/internal/balancer/priority/balancer_child.go rename to internal/xds/balancer/priority/balancer_child.go diff --git a/xds/internal/balancer/priority/balancer_priority.go b/internal/xds/balancer/priority/balancer_priority.go similarity index 100% rename from xds/internal/balancer/priority/balancer_priority.go rename to internal/xds/balancer/priority/balancer_priority.go diff --git a/xds/internal/balancer/priority/balancer_test.go b/internal/xds/balancer/priority/balancer_test.go similarity index 100% rename from xds/internal/balancer/priority/balancer_test.go rename to internal/xds/balancer/priority/balancer_test.go diff --git a/xds/internal/balancer/priority/config.go b/internal/xds/balancer/priority/config.go similarity index 100% rename from xds/internal/balancer/priority/config.go rename to internal/xds/balancer/priority/config.go diff --git a/xds/internal/balancer/priority/config_test.go b/internal/xds/balancer/priority/config_test.go similarity index 100% rename from xds/internal/balancer/priority/config_test.go rename to internal/xds/balancer/priority/config_test.go diff --git a/xds/internal/balancer/priority/ignore_resolve_now.go b/internal/xds/balancer/priority/ignore_resolve_now.go similarity index 100% rename from xds/internal/balancer/priority/ignore_resolve_now.go rename to internal/xds/balancer/priority/ignore_resolve_now.go diff --git a/xds/internal/balancer/priority/ignore_resolve_now_test.go b/internal/xds/balancer/priority/ignore_resolve_now_test.go similarity index 100% rename from xds/internal/balancer/priority/ignore_resolve_now_test.go rename to internal/xds/balancer/priority/ignore_resolve_now_test.go diff --git a/xds/internal/balancer/priority/logging.go b/internal/xds/balancer/priority/logging.go similarity index 100% rename from xds/internal/balancer/priority/logging.go rename to internal/xds/balancer/priority/logging.go diff --git a/xds/internal/balancer/wrrlocality/balancer.go b/internal/xds/balancer/wrrlocality/balancer.go similarity index 98% rename from xds/internal/balancer/wrrlocality/balancer.go rename to internal/xds/balancer/wrrlocality/balancer.go index 0c99c108f..b11aaa17e 100644 --- a/xds/internal/balancer/wrrlocality/balancer.go +++ b/internal/xds/balancer/wrrlocality/balancer.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/balancer/weightedtarget" "google.golang.org/grpc/internal/grpclog" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" + xdsinternal "google.golang.org/grpc/internal/xds" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal" ) // Name is the name of wrr_locality balancer. @@ -171,7 +171,7 @@ func (b *wrrLocalityBalancer) UpdateClientConnState(s balancer.ClientConnState) // shouldn't happen though (this attribute that is set actually gets // used to build localities in the first place), and thus don't error // out, and just build a weighted target with undefined behavior. - locality := internal.LocalityString(internal.GetLocalityID(addr)) + locality := xdsinternal.LocalityString(xdsinternal.GetLocalityID(addr)) ai, ok := getAddrInfo(addr) if !ok { return fmt.Errorf("xds_wrr_locality: missing locality weight information in address %q", addr) diff --git a/xds/internal/balancer/wrrlocality/balancer_test.go b/internal/xds/balancer/wrrlocality/balancer_test.go similarity index 97% rename from xds/internal/balancer/wrrlocality/balancer_test.go rename to internal/xds/balancer/wrrlocality/balancer_test.go index 9c3a499e6..b006a52b2 100644 --- a/xds/internal/balancer/wrrlocality/balancer_test.go +++ b/internal/xds/balancer/wrrlocality/balancer_test.go @@ -34,10 +34,10 @@ import ( "google.golang.org/grpc/internal/grpctest" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/testutils" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/clients" ) const ( @@ -179,7 +179,7 @@ func (s) TestUpdateClientConnState(t *testing.T) { addr1 := resolver.Address{ Addr: "locality-1", } - addr1 = internal.SetLocalityID(addr1, clients.Locality{ + addr1 = xdsinternal.SetLocalityID(addr1, clients.Locality{ Region: "region-1", Zone: "zone-1", SubZone: "subzone-1", @@ -189,7 +189,7 @@ func (s) TestUpdateClientConnState(t *testing.T) { addr2 := resolver.Address{ Addr: "locality-2", } - addr2 = internal.SetLocalityID(addr2, clients.Locality{ + addr2 = xdsinternal.SetLocalityID(addr2, clients.Locality{ Region: "region-2", Zone: "zone-2", SubZone: "subzone-2", diff --git a/xds/internal/balancer/wrrlocality/logging.go b/internal/xds/balancer/wrrlocality/logging.go similarity index 100% rename from xds/internal/balancer/wrrlocality/logging.go rename to internal/xds/balancer/wrrlocality/logging.go diff --git a/xds/internal/clients/config.go b/internal/xds/clients/config.go similarity index 100% rename from xds/internal/clients/config.go rename to internal/xds/clients/config.go diff --git a/xds/internal/clients/grpctransport/examples_test.go b/internal/xds/clients/grpctransport/examples_test.go similarity index 92% rename from xds/internal/clients/grpctransport/examples_test.go rename to internal/xds/clients/grpctransport/examples_test.go index 57191d1fc..09f96782d 100644 --- a/xds/internal/clients/grpctransport/examples_test.go +++ b/internal/xds/clients/grpctransport/examples_test.go @@ -21,8 +21,8 @@ package grpctransport_test import ( "fmt" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" ) // ExampleServerIdentifierExtension demonstrates how to create diff --git a/xds/internal/clients/grpctransport/grpc_transport.go b/internal/xds/clients/grpctransport/grpc_transport.go similarity index 99% rename from xds/internal/clients/grpctransport/grpc_transport.go rename to internal/xds/clients/grpctransport/grpc_transport.go index 2659c301e..841029dc2 100644 --- a/xds/internal/clients/grpctransport/grpc_transport.go +++ b/internal/xds/clients/grpctransport/grpc_transport.go @@ -29,8 +29,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/grpc/keepalive" - "google.golang.org/grpc/xds/internal/clients" ) var ( diff --git a/xds/internal/clients/grpctransport/grpc_transport_ext_test.go b/internal/xds/clients/grpctransport/grpc_transport_ext_test.go similarity index 98% rename from xds/internal/clients/grpctransport/grpc_transport_ext_test.go rename to internal/xds/clients/grpctransport/grpc_transport_ext_test.go index 75ac51462..5c3050f8d 100644 --- a/xds/internal/clients/grpctransport/grpc_transport_ext_test.go +++ b/internal/xds/clients/grpctransport/grpc_transport_ext_test.go @@ -28,10 +28,10 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/local" "google.golang.org/grpc/internal/grpctest" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" ) const ( diff --git a/xds/internal/clients/grpctransport/grpc_transport_test.go b/internal/xds/clients/grpctransport/grpc_transport_test.go similarity index 99% rename from xds/internal/clients/grpctransport/grpc_transport_test.go rename to internal/xds/clients/grpctransport/grpc_transport_test.go index 23e752577..e33e889ef 100644 --- a/xds/internal/clients/grpctransport/grpc_transport_test.go +++ b/internal/xds/clients/grpctransport/grpc_transport_test.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/local" "google.golang.org/grpc/internal/grpctest" - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" diff --git a/xds/internal/clients/internal/backoff/backoff.go b/internal/xds/clients/internal/backoff/backoff.go similarity index 100% rename from xds/internal/clients/internal/backoff/backoff.go rename to internal/xds/clients/internal/backoff/backoff.go diff --git a/xds/internal/clients/internal/buffer/unbounded.go b/internal/xds/clients/internal/buffer/unbounded.go similarity index 100% rename from xds/internal/clients/internal/buffer/unbounded.go rename to internal/xds/clients/internal/buffer/unbounded.go diff --git a/xds/internal/clients/internal/buffer/unbounded_test.go b/internal/xds/clients/internal/buffer/unbounded_test.go similarity index 100% rename from xds/internal/clients/internal/buffer/unbounded_test.go rename to internal/xds/clients/internal/buffer/unbounded_test.go diff --git a/xds/internal/clients/internal/internal.go b/internal/xds/clients/internal/internal.go similarity index 97% rename from xds/internal/clients/internal/internal.go rename to internal/xds/clients/internal/internal.go index 371b4d19d..60cf82b2e 100644 --- a/xds/internal/clients/internal/internal.go +++ b/internal/xds/clients/internal/internal.go @@ -20,7 +20,7 @@ package internal import ( - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/clients/internal/internal_test.go b/internal/xds/clients/internal/internal_test.go similarity index 99% rename from xds/internal/clients/internal/internal_test.go rename to internal/xds/clients/internal/internal_test.go index 5b7889b7e..99deb5c2c 100644 --- a/xds/internal/clients/internal/internal_test.go +++ b/internal/xds/clients/internal/internal_test.go @@ -23,7 +23,7 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/grpc/internal/grpctest" - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/clients/internal/pretty/pretty.go b/internal/xds/clients/internal/pretty/pretty.go similarity index 100% rename from xds/internal/clients/internal/pretty/pretty.go rename to internal/xds/clients/internal/pretty/pretty.go diff --git a/xds/internal/clients/internal/syncutil/callback_serializer.go b/internal/xds/clients/internal/syncutil/callback_serializer.go similarity index 98% rename from xds/internal/clients/internal/syncutil/callback_serializer.go rename to internal/xds/clients/internal/syncutil/callback_serializer.go index 87c921a47..baab133f2 100644 --- a/xds/internal/clients/internal/syncutil/callback_serializer.go +++ b/internal/xds/clients/internal/syncutil/callback_serializer.go @@ -21,7 +21,7 @@ package syncutil import ( "context" - "google.golang.org/grpc/xds/internal/clients/internal/buffer" + "google.golang.org/grpc/internal/xds/clients/internal/buffer" ) // CallbackSerializer provides a mechanism to schedule callbacks in a diff --git a/xds/internal/clients/internal/syncutil/callback_serializer_test.go b/internal/xds/clients/internal/syncutil/callback_serializer_test.go similarity index 100% rename from xds/internal/clients/internal/syncutil/callback_serializer_test.go rename to internal/xds/clients/internal/syncutil/callback_serializer_test.go diff --git a/xds/internal/clients/internal/syncutil/event.go b/internal/xds/clients/internal/syncutil/event.go similarity index 100% rename from xds/internal/clients/internal/syncutil/event.go rename to internal/xds/clients/internal/syncutil/event.go diff --git a/xds/internal/clients/internal/syncutil/event_test.go b/internal/xds/clients/internal/syncutil/event_test.go similarity index 100% rename from xds/internal/clients/internal/syncutil/event_test.go rename to internal/xds/clients/internal/syncutil/event_test.go diff --git a/xds/internal/clients/internal/testutils/channel.go b/internal/xds/clients/internal/testutils/channel.go similarity index 100% rename from xds/internal/clients/internal/testutils/channel.go rename to internal/xds/clients/internal/testutils/channel.go diff --git a/xds/internal/clients/internal/testutils/e2e/clientresources.go b/internal/xds/clients/internal/testutils/e2e/clientresources.go similarity index 100% rename from xds/internal/clients/internal/testutils/e2e/clientresources.go rename to internal/xds/clients/internal/testutils/e2e/clientresources.go diff --git a/xds/internal/clients/internal/testutils/e2e/logging.go b/internal/xds/clients/internal/testutils/e2e/logging.go similarity index 100% rename from xds/internal/clients/internal/testutils/e2e/logging.go rename to internal/xds/clients/internal/testutils/e2e/logging.go diff --git a/xds/internal/clients/internal/testutils/e2e/server.go b/internal/xds/clients/internal/testutils/e2e/server.go similarity index 99% rename from xds/internal/clients/internal/testutils/e2e/server.go rename to internal/xds/clients/internal/testutils/e2e/server.go index f2903f53b..3426bbc84 100644 --- a/xds/internal/clients/internal/testutils/e2e/server.go +++ b/internal/xds/clients/internal/testutils/e2e/server.go @@ -30,7 +30,7 @@ import ( "github.com/envoyproxy/go-control-plane/pkg/cache/types" "google.golang.org/grpc" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/fakeserver" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/fakeserver" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/clients/internal/testutils/fakeserver/server.go b/internal/xds/clients/internal/testutils/fakeserver/server.go similarity index 99% rename from xds/internal/clients/internal/testutils/fakeserver/server.go rename to internal/xds/clients/internal/testutils/fakeserver/server.go index 6aa66a897..8adb2e866 100644 --- a/xds/internal/clients/internal/testutils/fakeserver/server.go +++ b/internal/xds/clients/internal/testutils/fakeserver/server.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" "google.golang.org/protobuf/proto" v3discoverygrpc "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" diff --git a/xds/internal/clients/internal/testutils/marshal_any.go b/internal/xds/clients/internal/testutils/marshal_any.go similarity index 100% rename from xds/internal/clients/internal/testutils/marshal_any.go rename to internal/xds/clients/internal/testutils/marshal_any.go diff --git a/xds/internal/clients/internal/testutils/restartable_listener.go b/internal/xds/clients/internal/testutils/restartable_listener.go similarity index 100% rename from xds/internal/clients/internal/testutils/restartable_listener.go rename to internal/xds/clients/internal/testutils/restartable_listener.go diff --git a/xds/internal/clients/internal/testutils/wrappers.go b/internal/xds/clients/internal/testutils/wrappers.go similarity index 100% rename from xds/internal/clients/internal/testutils/wrappers.go rename to internal/xds/clients/internal/testutils/wrappers.go diff --git a/xds/internal/clients/lrsclient/internal/internal.go b/internal/xds/clients/lrsclient/internal/internal.go similarity index 100% rename from xds/internal/clients/lrsclient/internal/internal.go rename to internal/xds/clients/lrsclient/internal/internal.go diff --git a/xds/internal/clients/lrsclient/load_store.go b/internal/xds/clients/lrsclient/load_store.go similarity index 99% rename from xds/internal/clients/lrsclient/load_store.go rename to internal/xds/clients/lrsclient/load_store.go index 6b35fd979..fcc6247ed 100644 --- a/xds/internal/clients/lrsclient/load_store.go +++ b/internal/xds/clients/lrsclient/load_store.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" - "google.golang.org/grpc/xds/internal/clients" - lrsclientinternal "google.golang.org/grpc/xds/internal/clients/lrsclient/internal" + "google.golang.org/grpc/internal/xds/clients" + lrsclientinternal "google.golang.org/grpc/internal/xds/clients/lrsclient/internal" ) // A LoadStore aggregates loads for multiple clusters and services that are diff --git a/xds/internal/clients/lrsclient/load_store_test.go b/internal/xds/clients/lrsclient/load_store_test.go similarity index 99% rename from xds/internal/clients/lrsclient/load_store_test.go rename to internal/xds/clients/lrsclient/load_store_test.go index ecbc2ccf5..abe1bc48b 100644 --- a/xds/internal/clients/lrsclient/load_store_test.go +++ b/internal/xds/clients/lrsclient/load_store_test.go @@ -26,8 +26,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "google.golang.org/grpc/xds/internal/clients" - lrsclientinternal "google.golang.org/grpc/xds/internal/clients/lrsclient/internal" + "google.golang.org/grpc/internal/xds/clients" + lrsclientinternal "google.golang.org/grpc/internal/xds/clients/lrsclient/internal" ) var ( diff --git a/xds/internal/clients/lrsclient/loadreport_test.go b/internal/xds/clients/lrsclient/loadreport_test.go similarity index 98% rename from xds/internal/clients/lrsclient/loadreport_test.go rename to internal/xds/clients/lrsclient/loadreport_test.go index cdddb39f9..b4d489ef8 100644 --- a/xds/internal/clients/lrsclient/loadreport_test.go +++ b/internal/xds/clients/lrsclient/loadreport_test.go @@ -30,14 +30,14 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/grpctest" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/fakeserver" + "google.golang.org/grpc/internal/xds/clients/lrsclient" + lrsclientinternal "google.golang.org/grpc/internal/xds/clients/lrsclient/internal" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/fakeserver" - "google.golang.org/grpc/xds/internal/clients/lrsclient" - lrsclientinternal "google.golang.org/grpc/xds/internal/clients/lrsclient/internal" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/durationpb" diff --git a/xds/internal/clients/lrsclient/logging.go b/internal/xds/clients/lrsclient/logging.go similarity index 100% rename from xds/internal/clients/lrsclient/logging.go rename to internal/xds/clients/lrsclient/logging.go diff --git a/xds/internal/clients/lrsclient/lrs_stream.go b/internal/xds/clients/lrsclient/lrs_stream.go similarity index 99% rename from xds/internal/clients/lrsclient/lrs_stream.go rename to internal/xds/clients/lrsclient/lrs_stream.go index bb275bdb4..9a95983b0 100644 --- a/xds/internal/clients/lrsclient/lrs_stream.go +++ b/internal/xds/clients/lrsclient/lrs_stream.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/internal/backoff" igrpclog "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/pretty" - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/durationpb" diff --git a/xds/internal/clients/lrsclient/lrsclient.go b/internal/xds/clients/lrsclient/lrsclient.go similarity index 96% rename from xds/internal/clients/lrsclient/lrsclient.go rename to internal/xds/clients/lrsclient/lrsclient.go index af163e220..8f7e1852d 100644 --- a/xds/internal/clients/lrsclient/lrsclient.go +++ b/internal/xds/clients/lrsclient/lrsclient.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc/grpclog" igrpclog "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/clients" - clientsinternal "google.golang.org/grpc/xds/internal/clients/internal" - "google.golang.org/grpc/xds/internal/clients/internal/backoff" + "google.golang.org/grpc/internal/xds/clients" + clientsinternal "google.golang.org/grpc/internal/xds/clients/internal" + "google.golang.org/grpc/internal/xds/clients/internal/backoff" ) const ( diff --git a/xds/internal/clients/lrsclient/lrsconfig.go b/internal/xds/clients/lrsclient/lrsconfig.go similarity index 95% rename from xds/internal/clients/lrsclient/lrsconfig.go rename to internal/xds/clients/lrsclient/lrsconfig.go index c4862ff76..6dde1b46b 100644 --- a/xds/internal/clients/lrsclient/lrsconfig.go +++ b/internal/xds/clients/lrsclient/lrsconfig.go @@ -19,7 +19,7 @@ package lrsclient import ( - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" ) // Config is used to configure an LRS client. After one has been passed to the diff --git a/xds/internal/clients/transport_builder.go b/internal/xds/clients/transport_builder.go similarity index 100% rename from xds/internal/clients/transport_builder.go rename to internal/xds/clients/transport_builder.go diff --git a/xds/internal/clients/xdsclient/ads_stream.go b/internal/xds/clients/xdsclient/ads_stream.go similarity index 98% rename from xds/internal/clients/xdsclient/ads_stream.go rename to internal/xds/clients/xdsclient/ads_stream.go index 9f5e99ac2..4e88852fc 100644 --- a/xds/internal/clients/xdsclient/ads_stream.go +++ b/internal/xds/clients/xdsclient/ads_stream.go @@ -27,11 +27,11 @@ import ( "google.golang.org/grpc/grpclog" igrpclog "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/internal/backoff" - "google.golang.org/grpc/xds/internal/clients/internal/buffer" - "google.golang.org/grpc/xds/internal/clients/internal/pretty" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/internal/backoff" + "google.golang.org/grpc/internal/xds/clients/internal/buffer" + "google.golang.org/grpc/internal/xds/clients/internal/pretty" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/clients/xdsclient/authority.go b/internal/xds/clients/xdsclient/authority.go similarity index 99% rename from xds/internal/clients/xdsclient/authority.go rename to internal/xds/clients/xdsclient/authority.go index 35411d02d..4ad55c350 100644 --- a/xds/internal/clients/xdsclient/authority.go +++ b/internal/xds/clients/xdsclient/authority.go @@ -27,10 +27,10 @@ import ( "google.golang.org/grpc/grpclog" igrpclog "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/internal/syncutil" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" - "google.golang.org/grpc/xds/internal/clients/xdsclient/metrics" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/internal/syncutil" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/xdsclient/metrics" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/xds/internal/clients/xdsclient/channel.go b/internal/xds/clients/xdsclient/channel.go similarity index 97% rename from xds/internal/clients/xdsclient/channel.go rename to internal/xds/clients/xdsclient/channel.go index 3d65ce6b4..f028b941b 100644 --- a/xds/internal/clients/xdsclient/channel.go +++ b/internal/xds/clients/xdsclient/channel.go @@ -26,11 +26,11 @@ import ( "google.golang.org/grpc/grpclog" igrpclog "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/internal" - "google.golang.org/grpc/xds/internal/clients/internal/backoff" - "google.golang.org/grpc/xds/internal/clients/internal/syncutil" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/internal" + "google.golang.org/grpc/internal/xds/clients/internal/backoff" + "google.golang.org/grpc/internal/xds/clients/internal/syncutil" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" ) const ( diff --git a/xds/internal/clients/xdsclient/channel_test.go b/internal/xds/clients/xdsclient/channel_test.go similarity index 98% rename from xds/internal/clients/xdsclient/channel_test.go rename to internal/xds/clients/xdsclient/channel_test.go index 50f52c173..2676f0039 100644 --- a/xds/internal/clients/xdsclient/channel_test.go +++ b/internal/xds/clients/xdsclient/channel_test.go @@ -30,12 +30,12 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/fakeserver" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/fakeserver" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/clients/xdsclient/clientimpl_watchers.go b/internal/xds/clients/xdsclient/clientimpl_watchers.go similarity index 98% rename from xds/internal/clients/xdsclient/clientimpl_watchers.go rename to internal/xds/clients/xdsclient/clientimpl_watchers.go index 913e313e1..68b29295c 100644 --- a/xds/internal/clients/xdsclient/clientimpl_watchers.go +++ b/internal/xds/clients/xdsclient/clientimpl_watchers.go @@ -21,7 +21,7 @@ package xdsclient import ( "fmt" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" ) // wrappingWatcher is a wrapper around an xdsresource.ResourceWatcher that adds diff --git a/xds/internal/clients/xdsclient/helpers_test.go b/internal/xds/clients/xdsclient/helpers_test.go similarity index 98% rename from xds/internal/clients/xdsclient/helpers_test.go rename to internal/xds/clients/xdsclient/helpers_test.go index efa025efb..6f5f85978 100644 --- a/xds/internal/clients/xdsclient/helpers_test.go +++ b/internal/xds/clients/xdsclient/helpers_test.go @@ -27,8 +27,8 @@ import ( "time" "google.golang.org/grpc/internal/grpctest" - "google.golang.org/grpc/xds/internal/clients/internal/pretty" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/internal/pretty" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/clients/xdsclient/internal/internal.go b/internal/xds/clients/xdsclient/internal/internal.go similarity index 100% rename from xds/internal/clients/xdsclient/internal/internal.go rename to internal/xds/clients/xdsclient/internal/internal.go diff --git a/xds/internal/clients/xdsclient/internal/xdsresource/ads_stream.go b/internal/xds/clients/xdsclient/internal/xdsresource/ads_stream.go similarity index 100% rename from xds/internal/clients/xdsclient/internal/xdsresource/ads_stream.go rename to internal/xds/clients/xdsclient/internal/xdsresource/ads_stream.go diff --git a/xds/internal/clients/xdsclient/internal/xdsresource/errors.go b/internal/xds/clients/xdsclient/internal/xdsresource/errors.go similarity index 100% rename from xds/internal/clients/xdsclient/internal/xdsresource/errors.go rename to internal/xds/clients/xdsclient/internal/xdsresource/errors.go diff --git a/xds/internal/clients/xdsclient/internal/xdsresource/name.go b/internal/xds/clients/xdsclient/internal/xdsresource/name.go similarity index 100% rename from xds/internal/clients/xdsclient/internal/xdsresource/name.go rename to internal/xds/clients/xdsclient/internal/xdsresource/name.go diff --git a/xds/internal/clients/xdsclient/internal/xdsresource/type.go b/internal/xds/clients/xdsclient/internal/xdsresource/type.go similarity index 100% rename from xds/internal/clients/xdsclient/internal/xdsresource/type.go rename to internal/xds/clients/xdsclient/internal/xdsresource/type.go diff --git a/xds/internal/clients/xdsclient/internal/xdsresource/version.go b/internal/xds/clients/xdsclient/internal/xdsresource/version.go similarity index 100% rename from xds/internal/clients/xdsclient/internal/xdsresource/version.go rename to internal/xds/clients/xdsclient/internal/xdsresource/version.go diff --git a/xds/internal/clients/xdsclient/logging.go b/internal/xds/clients/xdsclient/logging.go similarity index 100% rename from xds/internal/clients/xdsclient/logging.go rename to internal/xds/clients/xdsclient/logging.go diff --git a/xds/internal/clients/xdsclient/metrics/metrics.go b/internal/xds/clients/xdsclient/metrics/metrics.go similarity index 100% rename from xds/internal/clients/xdsclient/metrics/metrics.go rename to internal/xds/clients/xdsclient/metrics/metrics.go diff --git a/xds/internal/clients/xdsclient/resource_type.go b/internal/xds/clients/xdsclient/resource_type.go similarity index 100% rename from xds/internal/clients/xdsclient/resource_type.go rename to internal/xds/clients/xdsclient/resource_type.go diff --git a/xds/internal/clients/xdsclient/resource_watcher.go b/internal/xds/clients/xdsclient/resource_watcher.go similarity index 100% rename from xds/internal/clients/xdsclient/resource_watcher.go rename to internal/xds/clients/xdsclient/resource_watcher.go diff --git a/xds/internal/clients/xdsclient/test/ads_stream_ack_nack_test.go b/internal/xds/clients/xdsclient/test/ads_stream_ack_nack_test.go similarity index 98% rename from xds/internal/clients/xdsclient/test/ads_stream_ack_nack_test.go rename to internal/xds/clients/xdsclient/test/ads_stream_ack_nack_test.go index 467365d26..75639b4c6 100644 --- a/xds/internal/clients/xdsclient/test/ads_stream_ack_nack_test.go +++ b/internal/xds/clients/xdsclient/test/ads_stream_ack_nack_test.go @@ -28,12 +28,12 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" diff --git a/xds/internal/clients/xdsclient/test/ads_stream_backoff_test.go b/internal/xds/clients/xdsclient/test/ads_stream_backoff_test.go similarity index 97% rename from xds/internal/clients/xdsclient/test/ads_stream_backoff_test.go rename to internal/xds/clients/xdsclient/test/ads_stream_backoff_test.go index ad5ed26f6..6dc2ac51b 100644 --- a/xds/internal/clients/xdsclient/test/ads_stream_backoff_test.go +++ b/internal/xds/clients/xdsclient/test/ads_stream_backoff_test.go @@ -27,13 +27,13 @@ import ( "time" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - xdsclientinternal "google.golang.org/grpc/xds/internal/clients/xdsclient/internal" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + xdsclientinternal "google.golang.org/grpc/internal/xds/clients/xdsclient/internal" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/testing/protocmp" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/clients/xdsclient/test/ads_stream_flow_control_test.go b/internal/xds/clients/xdsclient/test/ads_stream_flow_control_test.go similarity index 98% rename from xds/internal/clients/xdsclient/test/ads_stream_flow_control_test.go rename to internal/xds/clients/xdsclient/test/ads_stream_flow_control_test.go index fe53c76a3..9c417a14b 100644 --- a/xds/internal/clients/xdsclient/test/ads_stream_flow_control_test.go +++ b/internal/xds/clients/xdsclient/test/ads_stream_flow_control_test.go @@ -33,10 +33,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/testutils/xds/e2e" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" ) // blockingListenerWatcher implements xdsresource.ListenerWatcher. It writes to diff --git a/xds/internal/clients/xdsclient/test/ads_stream_restart_test.go b/internal/xds/clients/xdsclient/test/ads_stream_restart_test.go similarity index 96% rename from xds/internal/clients/xdsclient/test/ads_stream_restart_test.go rename to internal/xds/clients/xdsclient/test/ads_stream_restart_test.go index 9d8b876dd..b205ac2d3 100644 --- a/xds/internal/clients/xdsclient/test/ads_stream_restart_test.go +++ b/internal/xds/clients/xdsclient/test/ads_stream_restart_test.go @@ -26,10 +26,10 @@ import ( "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/testutils/xds/e2e" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" diff --git a/xds/internal/clients/xdsclient/test/ads_stream_watch_test.go b/internal/xds/clients/xdsclient/test/ads_stream_watch_test.go similarity index 96% rename from xds/internal/clients/xdsclient/test/ads_stream_watch_test.go rename to internal/xds/clients/xdsclient/test/ads_stream_watch_test.go index 178da6c59..2875d537c 100644 --- a/xds/internal/clients/xdsclient/test/ads_stream_watch_test.go +++ b/internal/xds/clients/xdsclient/test/ads_stream_watch_test.go @@ -28,11 +28,11 @@ import ( "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/testutils/xds/e2e" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - xdsclientinternal "google.golang.org/grpc/xds/internal/clients/xdsclient/internal" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + xdsclientinternal "google.golang.org/grpc/internal/xds/clients/xdsclient/internal" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" ) diff --git a/xds/internal/clients/xdsclient/test/authority_test.go b/internal/xds/clients/xdsclient/test/authority_test.go similarity index 97% rename from xds/internal/clients/xdsclient/test/authority_test.go rename to internal/xds/clients/xdsclient/test/authority_test.go index 0256c5bb0..424ae15c9 100644 --- a/xds/internal/clients/xdsclient/test/authority_test.go +++ b/internal/xds/clients/xdsclient/test/authority_test.go @@ -25,12 +25,12 @@ import ( "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" ) diff --git a/xds/internal/clients/xdsclient/test/dump_test.go b/internal/xds/clients/xdsclient/test/dump_test.go similarity index 97% rename from xds/internal/clients/xdsclient/test/dump_test.go rename to internal/xds/clients/xdsclient/test/dump_test.go index 49f09453f..900e91e23 100644 --- a/xds/internal/clients/xdsclient/test/dump_test.go +++ b/internal/xds/clients/xdsclient/test/dump_test.go @@ -29,13 +29,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/pretty" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/pretty" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/clients/xdsclient/test/helpers_test.go b/internal/xds/clients/xdsclient/test/helpers_test.go similarity index 97% rename from xds/internal/clients/xdsclient/test/helpers_test.go rename to internal/xds/clients/xdsclient/test/helpers_test.go index 6e7086fbd..ae7d5cea6 100644 --- a/xds/internal/clients/xdsclient/test/helpers_test.go +++ b/internal/xds/clients/xdsclient/test/helpers_test.go @@ -29,10 +29,10 @@ import ( "time" "google.golang.org/grpc/internal/grpctest" - "google.golang.org/grpc/xds/internal/clients/internal/pretty" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/internal/pretty" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/clients/xdsclient/test/lds_watchers_test.go b/internal/xds/clients/xdsclient/test/lds_watchers_test.go similarity index 99% rename from xds/internal/clients/xdsclient/test/lds_watchers_test.go rename to internal/xds/clients/xdsclient/test/lds_watchers_test.go index e31d34574..e41375590 100644 --- a/xds/internal/clients/xdsclient/test/lds_watchers_test.go +++ b/internal/xds/clients/xdsclient/test/lds_watchers_test.go @@ -29,14 +29,14 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/syncutil" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - xdsclientinternal "google.golang.org/grpc/xds/internal/clients/xdsclient/internal" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/syncutil" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + xdsclientinternal "google.golang.org/grpc/internal/xds/clients/xdsclient/internal" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" diff --git a/xds/internal/clients/xdsclient/test/metrics_test.go b/internal/xds/clients/xdsclient/test/metrics_test.go similarity index 97% rename from xds/internal/clients/xdsclient/test/metrics_test.go rename to internal/xds/clients/xdsclient/test/metrics_test.go index b49693bcf..8332cc57f 100644 --- a/xds/internal/clients/xdsclient/test/metrics_test.go +++ b/internal/xds/clients/xdsclient/test/metrics_test.go @@ -27,12 +27,12 @@ import ( "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/testutils" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" - "google.golang.org/grpc/xds/internal/clients/xdsclient/metrics" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/xdsclient/metrics" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" diff --git a/xds/internal/clients/xdsclient/test/misc_watchers_test.go b/internal/xds/clients/xdsclient/test/misc_watchers_test.go similarity index 98% rename from xds/internal/clients/xdsclient/test/misc_watchers_test.go rename to internal/xds/clients/xdsclient/test/misc_watchers_test.go index 824d54bef..b9e24957c 100644 --- a/xds/internal/clients/xdsclient/test/misc_watchers_test.go +++ b/internal/xds/clients/xdsclient/test/misc_watchers_test.go @@ -27,13 +27,13 @@ import ( "github.com/google/uuid" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/internal/testutils" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/e2e" - "google.golang.org/grpc/xds/internal/clients/internal/testutils/fakeserver" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/internal/testutils" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/e2e" + "google.golang.org/grpc/internal/xds/clients/internal/testutils/fakeserver" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" "google.golang.org/protobuf/types/known/anypb" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" diff --git a/xds/internal/clients/xdsclient/xdsclient.go b/internal/xds/clients/xdsclient/xdsclient.go similarity index 97% rename from xds/internal/clients/xdsclient/xdsclient.go rename to internal/xds/clients/xdsclient/xdsclient.go index f111e62a9..b6f27f4d8 100644 --- a/xds/internal/clients/xdsclient/xdsclient.go +++ b/internal/xds/clients/xdsclient/xdsclient.go @@ -39,13 +39,13 @@ import ( "time" "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/clients" - clientsinternal "google.golang.org/grpc/xds/internal/clients/internal" - "google.golang.org/grpc/xds/internal/clients/internal/backoff" - "google.golang.org/grpc/xds/internal/clients/internal/syncutil" - xdsclientinternal "google.golang.org/grpc/xds/internal/clients/xdsclient/internal" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" - "google.golang.org/grpc/xds/internal/clients/xdsclient/metrics" + "google.golang.org/grpc/internal/xds/clients" + clientsinternal "google.golang.org/grpc/internal/xds/clients/internal" + "google.golang.org/grpc/internal/xds/clients/internal/backoff" + "google.golang.org/grpc/internal/xds/clients/internal/syncutil" + xdsclientinternal "google.golang.org/grpc/internal/xds/clients/xdsclient/internal" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients/xdsclient/metrics" "google.golang.org/protobuf/proto" v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" diff --git a/xds/internal/clients/xdsclient/xdsclient_test.go b/internal/xds/clients/xdsclient/xdsclient_test.go similarity index 95% rename from xds/internal/clients/xdsclient/xdsclient_test.go rename to internal/xds/clients/xdsclient/xdsclient_test.go index 073362d02..d16643822 100644 --- a/xds/internal/clients/xdsclient/xdsclient_test.go +++ b/internal/xds/clients/xdsclient/xdsclient_test.go @@ -23,9 +23,9 @@ import ( "testing" "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/xdsclient/internal/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/xdsclient/internal/xdsresource" ) func (s) TestXDSClient_New(t *testing.T) { diff --git a/xds/internal/clients/xdsclient/xdsconfig.go b/internal/xds/clients/xdsclient/xdsconfig.go similarity index 98% rename from xds/internal/clients/xdsclient/xdsconfig.go rename to internal/xds/clients/xdsclient/xdsconfig.go index a276309df..8d3c101e6 100644 --- a/xds/internal/clients/xdsclient/xdsconfig.go +++ b/internal/xds/clients/xdsclient/xdsconfig.go @@ -19,7 +19,7 @@ package xdsclient import ( - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" ) // Config is used to configure an xDS client. After one has been passed to the diff --git a/xds/internal/clusterspecifier/cluster_specifier.go b/internal/xds/clusterspecifier/cluster_specifier.go similarity index 100% rename from xds/internal/clusterspecifier/cluster_specifier.go rename to internal/xds/clusterspecifier/cluster_specifier.go diff --git a/xds/internal/clusterspecifier/rls/rls.go b/internal/xds/clusterspecifier/rls/rls.go similarity index 98% rename from xds/internal/clusterspecifier/rls/rls.go rename to internal/xds/clusterspecifier/rls/rls.go index 50f58cd43..ce2c22537 100644 --- a/xds/internal/clusterspecifier/rls/rls.go +++ b/internal/xds/clusterspecifier/rls/rls.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/internal" rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" - "google.golang.org/grpc/xds/internal/clusterspecifier" + "google.golang.org/grpc/internal/xds/clusterspecifier" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/clusterspecifier/rls/rls_test.go b/internal/xds/clusterspecifier/rls/rls_test.go similarity index 97% rename from xds/internal/clusterspecifier/rls/rls_test.go rename to internal/xds/clusterspecifier/rls/rls_test.go index 8f09ac152..70be4b888 100644 --- a/xds/internal/clusterspecifier/rls/rls_test.go +++ b/internal/xds/clusterspecifier/rls/rls_test.go @@ -27,12 +27,12 @@ import ( "google.golang.org/grpc/internal/grpctest" rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/internal/testutils" - "google.golang.org/grpc/xds/internal/clusterspecifier" + "google.golang.org/grpc/internal/xds/clusterspecifier" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/grpc/balancer/rls" // Register the RLS LB policy. - _ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" // Register the CDS LB policy. + _ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" // Register the CDS LB policy. ) func init() { diff --git a/xds/internal/httpfilter/fault/fault.go b/internal/xds/httpfilter/fault/fault.go similarity index 99% rename from xds/internal/httpfilter/fault/fault.go rename to internal/xds/httpfilter/fault/fault.go index 0ffa9c827..3acd4aec6 100644 --- a/xds/internal/httpfilter/fault/fault.go +++ b/internal/xds/httpfilter/fault/fault.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/codes" iresolver "google.golang.org/grpc/internal/resolver" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/httpfilter" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/httpfilter/fault/fault_test.go b/internal/xds/httpfilter/fault/fault_test.go similarity index 99% rename from xds/internal/httpfilter/fault/fault_test.go rename to internal/xds/httpfilter/fault/fault_test.go index 27377ccd7..2612094ba 100644 --- a/xds/internal/httpfilter/fault/fault_test.go +++ b/internal/xds/httpfilter/fault/fault_test.go @@ -55,9 +55,9 @@ import ( testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" - _ "google.golang.org/grpc/xds/internal/balancer" // Register the balancers. - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter. - _ "google.golang.org/grpc/xds/internal/resolver" // Register the xds_resolver. + _ "google.golang.org/grpc/internal/xds/balancer" // Register the balancers. + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter. + _ "google.golang.org/grpc/internal/xds/resolver" // Register the xds_resolver. ) const defaultTestTimeout = 10 * time.Second diff --git a/xds/internal/httpfilter/httpfilter.go b/internal/xds/httpfilter/httpfilter.go similarity index 100% rename from xds/internal/httpfilter/httpfilter.go rename to internal/xds/httpfilter/httpfilter.go diff --git a/xds/internal/httpfilter/rbac/rbac.go b/internal/xds/httpfilter/rbac/rbac.go similarity index 99% rename from xds/internal/httpfilter/rbac/rbac.go rename to internal/xds/httpfilter/rbac/rbac.go index 260dad756..015500903 100644 --- a/xds/internal/httpfilter/rbac/rbac.go +++ b/internal/xds/httpfilter/rbac/rbac.go @@ -26,8 +26,8 @@ import ( "strings" "google.golang.org/grpc/internal/resolver" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/grpc/internal/xds/rbac" - "google.golang.org/grpc/xds/internal/httpfilter" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/httpfilter/router/router.go b/internal/xds/httpfilter/router/router.go similarity index 98% rename from xds/internal/httpfilter/router/router.go rename to internal/xds/httpfilter/router/router.go index a781523d3..d3a498d67 100644 --- a/xds/internal/httpfilter/router/router.go +++ b/internal/xds/httpfilter/router/router.go @@ -23,7 +23,7 @@ import ( "fmt" iresolver "google.golang.org/grpc/internal/resolver" - "google.golang.org/grpc/xds/internal/httpfilter" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/resolver/cluster_specifier_plugin_test.go b/internal/xds/resolver/cluster_specifier_plugin_test.go similarity index 98% rename from xds/internal/resolver/cluster_specifier_plugin_test.go rename to internal/xds/resolver/cluster_specifier_plugin_test.go index 5fc9e08aa..d9a3fcec9 100644 --- a/xds/internal/resolver/cluster_specifier_plugin_test.go +++ b/internal/xds/resolver/cluster_specifier_plugin_test.go @@ -29,10 +29,10 @@ import ( iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + "google.golang.org/grpc/internal/xds/balancer/clustermanager" + "google.golang.org/grpc/internal/xds/clusterspecifier" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal/balancer/clustermanager" - "google.golang.org/grpc/xds/internal/clusterspecifier" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/xds/internal/resolver/helpers_test.go b/internal/xds/resolver/helpers_test.go similarity index 98% rename from xds/internal/resolver/helpers_test.go rename to internal/xds/resolver/helpers_test.go index cdb9511b0..b15d913cb 100644 --- a/xds/internal/resolver/helpers_test.go +++ b/internal/xds/resolver/helpers_test.go @@ -34,11 +34,11 @@ import ( iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + xdsresolver "google.golang.org/grpc/internal/xds/resolver" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" - xdsresolver "google.golang.org/grpc/xds/internal/resolver" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" diff --git a/xds/internal/resolver/internal/internal.go b/internal/xds/resolver/internal/internal.go similarity index 100% rename from xds/internal/resolver/internal/internal.go rename to internal/xds/resolver/internal/internal.go diff --git a/xds/internal/resolver/logging.go b/internal/xds/resolver/logging.go similarity index 100% rename from xds/internal/resolver/logging.go rename to internal/xds/resolver/logging.go diff --git a/xds/internal/resolver/serviceconfig.go b/internal/xds/resolver/serviceconfig.go similarity index 98% rename from xds/internal/resolver/serviceconfig.go rename to internal/xds/resolver/serviceconfig.go index 40f038b8a..2b4e5a05d 100644 --- a/xds/internal/resolver/serviceconfig.go +++ b/internal/xds/resolver/serviceconfig.go @@ -35,11 +35,11 @@ import ( iringhash "google.golang.org/grpc/internal/ringhash" "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/wrr" + "google.golang.org/grpc/internal/xds/balancer/clustermanager" + "google.golang.org/grpc/internal/xds/httpfilter" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/balancer/clustermanager" - "google.golang.org/grpc/xds/internal/httpfilter" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) const ( diff --git a/xds/internal/resolver/serviceconfig_test.go b/internal/xds/resolver/serviceconfig_test.go similarity index 97% rename from xds/internal/resolver/serviceconfig_test.go rename to internal/xds/resolver/serviceconfig_test.go index 003076dee..3570ff2eb 100644 --- a/xds/internal/resolver/serviceconfig_test.go +++ b/internal/xds/resolver/serviceconfig_test.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc/internal/grpcutil" iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/testutils" + _ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" // To parse LB config + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/metadata" - _ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" // To parse LB config - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) var defaultTestTimeout = 10 * time.Second diff --git a/xds/internal/resolver/watch_service.go b/internal/xds/resolver/watch_service.go similarity index 98% rename from xds/internal/resolver/watch_service.go rename to internal/xds/resolver/watch_service.go index e8d52d0e0..44b885c44 100644 --- a/xds/internal/resolver/watch_service.go +++ b/internal/xds/resolver/watch_service.go @@ -21,7 +21,7 @@ package resolver import ( "context" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) type listenerWatcher struct { diff --git a/xds/internal/resolver/watch_service_test.go b/internal/xds/resolver/watch_service_test.go similarity index 100% rename from xds/internal/resolver/watch_service_test.go rename to internal/xds/resolver/watch_service_test.go diff --git a/xds/internal/resolver/xds_resolver.go b/internal/xds/resolver/xds_resolver.go similarity index 99% rename from xds/internal/resolver/xds_resolver.go rename to internal/xds/resolver/xds_resolver.go index a66719d06..70291f8ce 100644 --- a/xds/internal/resolver/xds_resolver.go +++ b/internal/xds/resolver/xds_resolver.go @@ -33,10 +33,10 @@ import ( iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/wrr" "google.golang.org/grpc/internal/xds/bootstrap" + rinternal "google.golang.org/grpc/internal/xds/resolver/internal" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/resolver" - rinternal "google.golang.org/grpc/xds/internal/resolver/internal" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) // Scheme is the xDS resolver's scheme. diff --git a/xds/internal/resolver/xds_resolver_test.go b/internal/xds/resolver/xds_resolver_test.go similarity index 99% rename from xds/internal/resolver/xds_resolver_test.go rename to internal/xds/resolver/xds_resolver_test.go index 87b6b8b45..6c6bbca16 100644 --- a/xds/internal/resolver/xds_resolver_test.go +++ b/internal/xds/resolver/xds_resolver_test.go @@ -38,15 +38,15 @@ import ( iringhash "google.golang.org/grpc/internal/ringhash" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + "google.golang.org/grpc/internal/xds/balancer/clustermanager" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/httpfilter" + rinternal "google.golang.org/grpc/internal/xds/resolver/internal" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/metadata" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal/balancer/clustermanager" - "google.golang.org/grpc/xds/internal/httpfilter" - rinternal "google.golang.org/grpc/xds/internal/resolver/internal" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/durationpb" @@ -61,8 +61,8 @@ import ( v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" - _ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" // Register the cds LB policy - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter + _ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" // Register the cds LB policy + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter ) // Tests the case where xDS client creation is expected to fail because the diff --git a/xds/internal/server/conn_wrapper.go b/internal/xds/server/conn_wrapper.go similarity index 99% rename from xds/internal/server/conn_wrapper.go rename to internal/xds/server/conn_wrapper.go index 92d07e7fb..840da7ca6 100644 --- a/xds/internal/server/conn_wrapper.go +++ b/internal/xds/server/conn_wrapper.go @@ -28,7 +28,7 @@ import ( "google.golang.org/grpc/credentials/tls/certprovider" xdsinternal "google.golang.org/grpc/internal/credentials/xds" "google.golang.org/grpc/internal/transport" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) // connWrapper is a thin wrapper around a net.Conn returned by Accept(). It diff --git a/xds/internal/server/listener_wrapper.go b/internal/xds/server/listener_wrapper.go similarity index 99% rename from xds/internal/server/listener_wrapper.go rename to internal/xds/server/listener_wrapper.go index 2c32ace8a..1f7da6117 100644 --- a/xds/internal/server/listener_wrapper.go +++ b/internal/xds/server/listener_wrapper.go @@ -33,7 +33,7 @@ import ( internalgrpclog "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) var ( diff --git a/xds/internal/server/rds_handler.go b/internal/xds/server/rds_handler.go similarity index 98% rename from xds/internal/server/rds_handler.go rename to internal/xds/server/rds_handler.go index 4b8eb22de..bf78c37c8 100644 --- a/xds/internal/server/rds_handler.go +++ b/internal/xds/server/rds_handler.go @@ -22,7 +22,7 @@ import ( "sync" igrpclog "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) // rdsHandler handles any RDS queries that need to be started for a given server diff --git a/xds/internal/server/rds_handler_test.go b/internal/xds/server/rds_handler_test.go similarity index 98% rename from xds/internal/server/rds_handler_test.go rename to internal/xds/server/rds_handler_test.go index 886cf5353..429ccaa12 100644 --- a/xds/internal/server/rds_handler_test.go +++ b/internal/xds/server/rds_handler_test.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc/internal/grpctest" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" diff --git a/xds/internal/test/e2e/README.md b/internal/xds/test/e2e/README.md similarity index 100% rename from xds/internal/test/e2e/README.md rename to internal/xds/test/e2e/README.md diff --git a/xds/internal/test/e2e/controlplane.go b/internal/xds/test/e2e/controlplane.go similarity index 100% rename from xds/internal/test/e2e/controlplane.go rename to internal/xds/test/e2e/controlplane.go diff --git a/xds/internal/test/e2e/e2e.go b/internal/xds/test/e2e/e2e.go similarity index 100% rename from xds/internal/test/e2e/e2e.go rename to internal/xds/test/e2e/e2e.go diff --git a/xds/internal/test/e2e/e2e_test.go b/internal/xds/test/e2e/e2e_test.go similarity index 100% rename from xds/internal/test/e2e/e2e_test.go rename to internal/xds/test/e2e/e2e_test.go diff --git a/xds/internal/test/e2e/e2e_utils.go b/internal/xds/test/e2e/e2e_utils.go similarity index 100% rename from xds/internal/test/e2e/e2e_utils.go rename to internal/xds/test/e2e/e2e_utils.go diff --git a/xds/internal/test/e2e/run.sh b/internal/xds/test/e2e/run.sh similarity index 100% rename from xds/internal/test/e2e/run.sh rename to internal/xds/test/e2e/run.sh diff --git a/xds/internal/testutils/balancer_test.go b/internal/xds/testutils/balancer_test.go similarity index 100% rename from xds/internal/testutils/balancer_test.go rename to internal/xds/testutils/balancer_test.go diff --git a/xds/internal/testutils/fakeclient/client.go b/internal/xds/testutils/fakeclient/client.go similarity index 96% rename from xds/internal/testutils/fakeclient/client.go rename to internal/xds/testutils/fakeclient/client.go index bfcbf5ae9..fa465139e 100644 --- a/xds/internal/testutils/fakeclient/client.go +++ b/internal/xds/testutils/fakeclient/client.go @@ -24,9 +24,9 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/lrsclient" - "google.golang.org/grpc/xds/internal/xdsclient" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/lrsclient" + "google.golang.org/grpc/internal/xds/xdsclient" ) // Client is a fake implementation of an xds client. It exposes a bunch of diff --git a/xds/internal/testutils/resource_watcher.go b/internal/xds/testutils/resource_watcher.go similarity index 97% rename from xds/internal/testutils/resource_watcher.go rename to internal/xds/testutils/resource_watcher.go index e8f7830a7..9feb8d2a5 100644 --- a/xds/internal/testutils/resource_watcher.go +++ b/internal/xds/testutils/resource_watcher.go @@ -18,7 +18,7 @@ package testutils -import "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" +import "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" // TestResourceWatcher implements the xdsresource.ResourceWatcher interface, // used to receive updates on watches registered with the xDS client, when using diff --git a/xds/internal/testutils/testutils.go b/internal/xds/testutils/testutils.go similarity index 92% rename from xds/internal/testutils/testutils.go rename to internal/xds/testutils/testutils.go index 15049b6a6..d806dec1e 100644 --- a/xds/internal/testutils/testutils.go +++ b/internal/xds/testutils/testutils.go @@ -19,8 +19,8 @@ package testutils import ( - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" ) // BuildResourceName returns the resource name in the format of an xdstp:// diff --git a/internal/xds/xds.go b/internal/xds/xds.go index 024c388b7..b9a4ec90a 100644 --- a/internal/xds/xds.go +++ b/internal/xds/xds.go @@ -14,12 +14,17 @@ * limitations under the License. */ -// Package xds contains methods to Get/Set handshake cluster names. It is separated -// out from the top level /internal package to avoid circular dependencies. +// Package xds contains functions, structs, and utilities for working with +// handshake cluster names, as well as shared components used by xds balancers +// and resolvers. It is separated from the top-level /internal package to +// avoid circular dependencies. package xds import ( + "fmt" + "google.golang.org/grpc/attributes" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/grpc/resolver" ) @@ -40,3 +45,60 @@ func GetXDSHandshakeClusterName(attr *attributes.Attributes) (string, bool) { name, ok := v.(string) return name, ok } + +// LocalityString generates a string representation of clients.Locality in the +// format specified in gRFC A76. +func LocalityString(l clients.Locality) string { + return fmt.Sprintf("{region=%q, zone=%q, sub_zone=%q}", l.Region, l.Zone, l.SubZone) +} + +// IsLocalityEqual allows the values to be compared by Attributes.Equal. +func IsLocalityEqual(l clients.Locality, o any) bool { + ol, ok := o.(clients.Locality) + if !ok { + return false + } + return l.Region == ol.Region && l.Zone == ol.Zone && l.SubZone == ol.SubZone +} + +// LocalityFromString converts a string representation of clients.locality as +// specified in gRFC A76, into a LocalityID struct. +func LocalityFromString(s string) (ret clients.Locality, _ error) { + _, err := fmt.Sscanf(s, "{region=%q, zone=%q, sub_zone=%q}", &ret.Region, &ret.Zone, &ret.SubZone) + if err != nil { + return clients.Locality{}, fmt.Errorf("%s is not a well formatted locality ID, error: %v", s, err) + } + return ret, nil +} + +type localityKeyType string + +const localityKey = localityKeyType("grpc.xds.internal.address.locality") + +// GetLocalityID returns the locality ID of addr. +func GetLocalityID(addr resolver.Address) clients.Locality { + path, _ := addr.BalancerAttributes.Value(localityKey).(clients.Locality) + return path +} + +// SetLocalityID sets locality ID in addr to l. +func SetLocalityID(addr resolver.Address, l clients.Locality) resolver.Address { + addr.BalancerAttributes = addr.BalancerAttributes.WithValue(localityKey, l) + return addr +} + +// SetLocalityIDInEndpoint sets locality ID in endpoint to l. +func SetLocalityIDInEndpoint(endpoint resolver.Endpoint, l clients.Locality) resolver.Endpoint { + endpoint.Attributes = endpoint.Attributes.WithValue(localityKey, l) + return endpoint +} + +// ResourceTypeMapForTesting maps TypeUrl to corresponding ResourceType. +var ResourceTypeMapForTesting map[string]any + +// UnknownCSMLabels are TelemetryLabels emitted from CDS if CSM Telemetry Label +// data is not present in the CDS Resource. +var UnknownCSMLabels = map[string]string{ + "csm.service_name": "unknown", + "csm.service_namespace_name": "unknown", +} diff --git a/xds/internal/internal_test.go b/internal/xds/xds_test.go similarity index 97% rename from xds/internal/internal_test.go rename to internal/xds/xds_test.go index 2f6893b5c..659be1206 100644 --- a/xds/internal/internal_test.go +++ b/internal/xds/xds_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package internal +package xds import ( "reflect" @@ -26,7 +26,7 @@ import ( corepb "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" "github.com/google/go-cmp/cmp" "google.golang.org/grpc/internal/grpctest" - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" ) const ignorePrefix = "XXX_" diff --git a/xds/internal/xdsclient/attributes.go b/internal/xds/xdsclient/attributes.go similarity index 100% rename from xds/internal/xdsclient/attributes.go rename to internal/xds/xdsclient/attributes.go diff --git a/xds/internal/xdsclient/client.go b/internal/xds/xdsclient/client.go similarity index 95% rename from xds/internal/xdsclient/client.go rename to internal/xds/xdsclient/client.go index 42f1a28f0..514273164 100644 --- a/xds/internal/xdsclient/client.go +++ b/internal/xds/xdsclient/client.go @@ -25,8 +25,8 @@ import ( v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients/lrsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/clients/lrsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) // XDSClient is a full fledged gRPC client which queries a set of discovery APIs diff --git a/xds/internal/xdsclient/client_refcounted_test.go b/internal/xds/xdsclient/client_refcounted_test.go similarity index 100% rename from xds/internal/xdsclient/client_refcounted_test.go rename to internal/xds/xdsclient/client_refcounted_test.go diff --git a/xds/internal/xdsclient/client_test.go b/internal/xds/xdsclient/client_test.go similarity index 100% rename from xds/internal/xdsclient/client_test.go rename to internal/xds/xdsclient/client_test.go diff --git a/xds/internal/xdsclient/clientimpl.go b/internal/xds/xdsclient/clientimpl.go similarity index 96% rename from xds/internal/xdsclient/clientimpl.go rename to internal/xds/xdsclient/clientimpl.go index f7610341a..9a73b96cf 100644 --- a/xds/internal/xdsclient/clientimpl.go +++ b/internal/xds/xdsclient/clientimpl.go @@ -29,12 +29,12 @@ import ( "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/lrsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/clients/xdsclient/metrics" xdsbootstrap "google.golang.org/grpc/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/lrsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/clients/xdsclient/metrics" ) const ( diff --git a/xds/internal/xdsclient/clientimpl_loadreport.go b/internal/xds/xdsclient/clientimpl_loadreport.go similarity index 91% rename from xds/internal/xdsclient/clientimpl_loadreport.go rename to internal/xds/xdsclient/clientimpl_loadreport.go index 39004ae7e..2cfe28d4a 100644 --- a/xds/internal/xdsclient/clientimpl_loadreport.go +++ b/internal/xds/xdsclient/clientimpl_loadreport.go @@ -22,9 +22,9 @@ import ( "sync" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/lrsclient" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/lrsclient" ) // ReportLoad starts a load reporting stream to the given server. All load diff --git a/xds/internal/xdsclient/clientimpl_test.go b/internal/xds/xdsclient/clientimpl_test.go similarity index 98% rename from xds/internal/xdsclient/clientimpl_test.go rename to internal/xds/xdsclient/clientimpl_test.go index fbfc24a07..85792a3d6 100644 --- a/xds/internal/xdsclient/clientimpl_test.go +++ b/internal/xds/xdsclient/clientimpl_test.go @@ -31,11 +31,11 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/testutils/stats" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/clients/grpctransport" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/clients/grpctransport" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/testing/protocmp" ) diff --git a/xds/internal/xdsclient/clientimpl_watchers.go b/internal/xds/xdsclient/clientimpl_watchers.go similarity index 95% rename from xds/internal/xdsclient/clientimpl_watchers.go rename to internal/xds/xdsclient/clientimpl_watchers.go index 29435993f..398de1ed7 100644 --- a/xds/internal/xdsclient/clientimpl_watchers.go +++ b/internal/xds/xdsclient/clientimpl_watchers.go @@ -18,7 +18,7 @@ package xdsclient import ( - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" ) // WatchResource uses xDS to discover the resource associated with the provided diff --git a/xds/internal/xdsclient/internal/internal.go b/internal/xds/xdsclient/internal/internal.go similarity index 100% rename from xds/internal/xdsclient/internal/internal.go rename to internal/xds/xdsclient/internal/internal.go diff --git a/xds/internal/xdsclient/logging.go b/internal/xds/xdsclient/logging.go similarity index 100% rename from xds/internal/xdsclient/logging.go rename to internal/xds/xdsclient/logging.go diff --git a/xds/internal/xdsclient/metrics_test.go b/internal/xds/xdsclient/metrics_test.go similarity index 99% rename from xds/internal/xdsclient/metrics_test.go rename to internal/xds/xdsclient/metrics_test.go index f876aa1a9..26a38aea3 100644 --- a/xds/internal/xdsclient/metrics_test.go +++ b/internal/xds/xdsclient/metrics_test.go @@ -30,12 +30,12 @@ import ( "google.golang.org/grpc/internal/testutils/stats" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter. + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter. ) type noopListenerWatcher struct{} diff --git a/xds/internal/xdsclient/pool.go b/internal/xds/xdsclient/pool.go similarity index 100% rename from xds/internal/xdsclient/pool.go rename to internal/xds/xdsclient/pool.go diff --git a/xds/internal/xdsclient/pool/pool_ext_test.go b/internal/xds/xdsclient/pool/pool_ext_test.go similarity index 99% rename from xds/internal/xdsclient/pool/pool_ext_test.go rename to internal/xds/xdsclient/pool/pool_ext_test.go index 6bd00b15f..2150a2703 100644 --- a/xds/internal/xdsclient/pool/pool_ext_test.go +++ b/internal/xds/xdsclient/pool/pool_ext_test.go @@ -34,8 +34,8 @@ import ( "google.golang.org/grpc/internal/testutils/stats" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" _ "google.golang.org/grpc/xds" - "google.golang.org/grpc/xds/internal/xdsclient" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" diff --git a/xds/internal/xdsclient/requests_counter.go b/internal/xds/xdsclient/requests_counter.go similarity index 100% rename from xds/internal/xdsclient/requests_counter.go rename to internal/xds/xdsclient/requests_counter.go diff --git a/xds/internal/xdsclient/requests_counter_test.go b/internal/xds/xdsclient/requests_counter_test.go similarity index 100% rename from xds/internal/xdsclient/requests_counter_test.go rename to internal/xds/xdsclient/requests_counter_test.go diff --git a/xds/internal/xdsclient/resource_types.go b/internal/xds/xdsclient/resource_types.go similarity index 91% rename from xds/internal/xdsclient/resource_types.go rename to internal/xds/xdsclient/resource_types.go index 2f76c83c8..88451ab82 100644 --- a/xds/internal/xdsclient/resource_types.go +++ b/internal/xds/xdsclient/resource_types.go @@ -19,9 +19,9 @@ package xdsclient import ( "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" ) func supportedResourceTypes(config *bootstrap.Config, gServerCfgMap map[xdsclient.ServerConfig]*bootstrap.ServerConfig) map[string]xdsclient.ResourceType { diff --git a/xds/internal/xdsclient/tests/ads_stream_ack_nack_test.go b/internal/xds/xdsclient/tests/ads_stream_ack_nack_test.go similarity index 99% rename from xds/internal/xdsclient/tests/ads_stream_ack_nack_test.go rename to internal/xds/xdsclient/tests/ads_stream_ack_nack_test.go index 09e9b39ed..29ddae55a 100644 --- a/xds/internal/xdsclient/tests/ads_stream_ack_nack_test.go +++ b/internal/xds/xdsclient/tests/ads_stream_ack_nack_test.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" diff --git a/xds/internal/xdsclient/tests/ads_stream_restart_test.go b/internal/xds/xdsclient/tests/ads_stream_restart_test.go similarity index 97% rename from xds/internal/xdsclient/tests/ads_stream_restart_test.go rename to internal/xds/xdsclient/tests/ads_stream_restart_test.go index a53f96fb6..58fad8028 100644 --- a/xds/internal/xdsclient/tests/ads_stream_restart_test.go +++ b/internal/xds/xdsclient/tests/ads_stream_restart_test.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/xdsclient/tests/authority_test.go b/internal/xds/xdsclient/tests/authority_test.go similarity index 98% rename from xds/internal/xdsclient/tests/authority_test.go rename to internal/xds/xdsclient/tests/authority_test.go index 187fb4d19..fbea7cb8e 100644 --- a/xds/internal/xdsclient/tests/authority_test.go +++ b/internal/xds/xdsclient/tests/authority_test.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - xdstestutils "google.golang.org/grpc/xds/internal/testutils" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + xdstestutils "google.golang.org/grpc/internal/xds/testutils" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" ) diff --git a/xds/internal/xdsclient/tests/cds_watchers_test.go b/internal/xds/xdsclient/tests/cds_watchers_test.go similarity index 99% rename from xds/internal/xdsclient/tests/cds_watchers_test.go rename to internal/xds/xdsclient/tests/cds_watchers_test.go index 3df630e5b..e63683402 100644 --- a/xds/internal/xdsclient/tests/cds_watchers_test.go +++ b/internal/xds/xdsclient/tests/cds_watchers_test.go @@ -34,8 +34,8 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/xdsclient/tests/client_custom_dialopts_test.go b/internal/xds/xdsclient/tests/client_custom_dialopts_test.go similarity index 98% rename from xds/internal/xdsclient/tests/client_custom_dialopts_test.go rename to internal/xds/xdsclient/tests/client_custom_dialopts_test.go index 0f65b69cd..39deb1240 100644 --- a/xds/internal/xdsclient/tests/client_custom_dialopts_test.go +++ b/internal/xds/xdsclient/tests/client_custom_dialopts_test.go @@ -34,11 +34,11 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" internalbootstrap "google.golang.org/grpc/internal/xds/bootstrap" + xci "google.golang.org/grpc/internal/xds/xdsclient/internal" testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/resolver" "google.golang.org/grpc/xds/bootstrap" - xci "google.golang.org/grpc/xds/internal/xdsclient/internal" ) // nopDialOption is a no-op grpc.DialOption with a name. diff --git a/xds/internal/xdsclient/tests/dump_test.go b/internal/xds/xdsclient/tests/dump_test.go similarity index 99% rename from xds/internal/xdsclient/tests/dump_test.go rename to internal/xds/xdsclient/tests/dump_test.go index 117c810b1..a476c29bc 100644 --- a/xds/internal/xdsclient/tests/dump_test.go +++ b/internal/xds/xdsclient/tests/dump_test.go @@ -34,8 +34,8 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/xdsclient/tests/eds_watchers_test.go b/internal/xds/xdsclient/tests/eds_watchers_test.go similarity index 99% rename from xds/internal/xdsclient/tests/eds_watchers_test.go rename to internal/xds/xdsclient/tests/eds_watchers_test.go index d551562c1..a76c58641 100644 --- a/xds/internal/xdsclient/tests/eds_watchers_test.go +++ b/internal/xds/xdsclient/tests/eds_watchers_test.go @@ -33,9 +33,9 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/protobuf/types/known/wrapperspb" v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" diff --git a/xds/internal/xdsclient/tests/fallback_test.go b/internal/xds/xdsclient/tests/fallback_test.go similarity index 99% rename from xds/internal/xdsclient/tests/fallback_test.go rename to internal/xds/xdsclient/tests/fallback_test.go index 5767a76a2..d4e2d8072 100644 --- a/xds/internal/xdsclient/tests/fallback_test.go +++ b/internal/xds/xdsclient/tests/fallback_test.go @@ -34,11 +34,11 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" diff --git a/xds/internal/xdsclient/tests/federation_watchers_test.go b/internal/xds/xdsclient/tests/federation_watchers_test.go similarity index 98% rename from xds/internal/xdsclient/tests/federation_watchers_test.go rename to internal/xds/xdsclient/tests/federation_watchers_test.go index 7f9babde5..1bf0dc554 100644 --- a/xds/internal/xdsclient/tests/federation_watchers_test.go +++ b/internal/xds/xdsclient/tests/federation_watchers_test.go @@ -26,9 +26,9 @@ import ( "github.com/google/uuid" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" diff --git a/xds/internal/xdsclient/tests/helpers_test.go b/internal/xds/xdsclient/tests/helpers_test.go similarity index 100% rename from xds/internal/xdsclient/tests/helpers_test.go rename to internal/xds/xdsclient/tests/helpers_test.go diff --git a/xds/internal/xdsclient/tests/lds_watchers_test.go b/internal/xds/xdsclient/tests/lds_watchers_test.go similarity index 99% rename from xds/internal/xdsclient/tests/lds_watchers_test.go rename to internal/xds/xdsclient/tests/lds_watchers_test.go index ff40de28a..877148639 100644 --- a/xds/internal/xdsclient/tests/lds_watchers_test.go +++ b/internal/xds/xdsclient/tests/lds_watchers_test.go @@ -34,16 +34,16 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3routerpb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3" v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter. _ "google.golang.org/grpc/xds" // To ensure internal.NewXDSResolverWithConfigForTesting is set. - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter. ) type noopListenerWatcher struct{} diff --git a/xds/internal/xdsclient/tests/loadreport_test.go b/internal/xds/xdsclient/tests/loadreport_test.go similarity index 99% rename from xds/internal/xdsclient/tests/loadreport_test.go rename to internal/xds/xdsclient/tests/loadreport_test.go index a93b5bc1c..97ab891ab 100644 --- a/xds/internal/xdsclient/tests/loadreport_test.go +++ b/internal/xds/xdsclient/tests/loadreport_test.go @@ -34,8 +34,8 @@ import ( "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/testutils/xds/fakeserver" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/clients" "google.golang.org/protobuf/testing/protocmp" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/xdsclient/tests/rds_watchers_test.go b/internal/xds/xdsclient/tests/rds_watchers_test.go similarity index 99% rename from xds/internal/xdsclient/tests/rds_watchers_test.go rename to internal/xds/xdsclient/tests/rds_watchers_test.go index a650bd7c4..3ec333ad8 100644 --- a/xds/internal/xdsclient/tests/rds_watchers_test.go +++ b/internal/xds/xdsclient/tests/rds_watchers_test.go @@ -33,8 +33,8 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/protobuf/types/known/wrapperspb" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" diff --git a/xds/internal/xdsclient/tests/resource_update_test.go b/internal/xds/xdsclient/tests/resource_update_test.go similarity index 99% rename from xds/internal/xdsclient/tests/resource_update_test.go rename to internal/xds/xdsclient/tests/resource_update_test.go index 251094084..90517a908 100644 --- a/xds/internal/xdsclient/tests/resource_update_test.go +++ b/internal/xds/xdsclient/tests/resource_update_test.go @@ -33,9 +33,9 @@ import ( "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/testutils/xds/fakeserver" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/anypb" @@ -51,7 +51,7 @@ import ( v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter. + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter. ) // startFakeManagementServer starts a fake xDS management server and registers a diff --git a/xds/internal/xdsclient/xdsclient_test.go b/internal/xds/xdsclient/xdsclient_test.go similarity index 100% rename from xds/internal/xdsclient/xdsclient_test.go rename to internal/xds/xdsclient/xdsclient_test.go diff --git a/xds/internal/xdsclient/xdslbregistry/converter/converter.go b/internal/xds/xdsclient/xdslbregistry/converter/converter.go similarity index 98% rename from xds/internal/xdsclient/xdslbregistry/converter/converter.go rename to internal/xds/xdsclient/xdslbregistry/converter/converter.go index 959c6588b..d38b9db82 100644 --- a/xds/internal/xdsclient/xdslbregistry/converter/converter.go +++ b/internal/xds/xdsclient/xdslbregistry/converter/converter.go @@ -35,8 +35,8 @@ import ( "google.golang.org/grpc/balancer/weightedroundrobin" iringhash "google.golang.org/grpc/internal/ringhash" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" - "google.golang.org/grpc/xds/internal/balancer/wrrlocality" - "google.golang.org/grpc/xds/internal/xdsclient/xdslbregistry" + "google.golang.org/grpc/internal/xds/balancer/wrrlocality" + "google.golang.org/grpc/internal/xds/xdsclient/xdslbregistry" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/xdsclient/xdslbregistry/xdslbregistry.go b/internal/xds/xdsclient/xdslbregistry/xdslbregistry.go similarity index 100% rename from xds/internal/xdsclient/xdslbregistry/xdslbregistry.go rename to internal/xds/xdsclient/xdslbregistry/xdslbregistry.go diff --git a/xds/internal/xdsclient/xdslbregistry/xdslbregistry_test.go b/internal/xds/xdsclient/xdslbregistry/xdslbregistry_test.go similarity index 99% rename from xds/internal/xdsclient/xdslbregistry/xdslbregistry_test.go rename to internal/xds/xdsclient/xdslbregistry/xdslbregistry_test.go index 5760e632f..d23f46781 100644 --- a/xds/internal/xdsclient/xdslbregistry/xdslbregistry_test.go +++ b/internal/xds/xdsclient/xdslbregistry/xdslbregistry_test.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/internal/pretty" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/testutils" + "google.golang.org/grpc/internal/xds/balancer/wrrlocality" + "google.golang.org/grpc/internal/xds/xdsclient/xdslbregistry" _ "google.golang.org/grpc/xds" // Register the xDS LB Registry Converters. - "google.golang.org/grpc/xds/internal/balancer/wrrlocality" - "google.golang.org/grpc/xds/internal/xdsclient/xdslbregistry" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/xdsclient/xdsresource/cluster_resource_type.go b/internal/xds/xdsclient/xdsresource/cluster_resource_type.go similarity index 97% rename from xds/internal/xdsclient/xdsresource/cluster_resource_type.go rename to internal/xds/xdsclient/xdsresource/cluster_resource_type.go index de6335081..2a6a08f90 100644 --- a/xds/internal/xdsclient/xdsresource/cluster_resource_type.go +++ b/internal/xds/xdsclient/xdsresource/cluster_resource_type.go @@ -20,8 +20,8 @@ package xdsresource import ( "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/xds/bootstrap" - xdsclient "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + xdsclient "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/endpoints_resource_type.go b/internal/xds/xdsclient/xdsresource/endpoints_resource_type.go similarity index 97% rename from xds/internal/xdsclient/xdsresource/endpoints_resource_type.go rename to internal/xds/xdsclient/xdsresource/endpoints_resource_type.go index dd8a3b38c..7ca45ec6a 100644 --- a/xds/internal/xdsclient/xdsresource/endpoints_resource_type.go +++ b/internal/xds/xdsclient/xdsresource/endpoints_resource_type.go @@ -19,8 +19,8 @@ package xdsresource import ( "google.golang.org/grpc/internal/pretty" - xdsclient "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + xdsclient "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/errors.go b/internal/xds/xdsclient/xdsresource/errors.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/errors.go rename to internal/xds/xdsclient/xdsresource/errors.go diff --git a/xds/internal/xdsclient/xdsresource/filter_chain.go b/internal/xds/xdsclient/xdsresource/filter_chain.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/filter_chain.go rename to internal/xds/xdsclient/xdsresource/filter_chain.go index 46bbcaf4a..76ace1090 100644 --- a/xds/internal/xdsclient/xdsresource/filter_chain.go +++ b/internal/xds/xdsclient/xdsresource/filter_chain.go @@ -25,9 +25,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/internal/resolver" + "google.golang.org/grpc/internal/xds/httpfilter" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/httpfilter" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" diff --git a/xds/internal/xdsclient/xdsresource/filter_chain_test.go b/internal/xds/xdsclient/xdsresource/filter_chain_test.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/filter_chain_test.go rename to internal/xds/xdsclient/xdsresource/filter_chain_test.go index 67b37dffb..a6dcacec7 100644 --- a/xds/internal/xdsclient/xdsresource/filter_chain_test.go +++ b/internal/xds/xdsclient/xdsresource/filter_chain_test.go @@ -43,9 +43,9 @@ import ( iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" - "google.golang.org/grpc/xds/internal/httpfilter" - "google.golang.org/grpc/xds/internal/httpfilter/router" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/httpfilter" + "google.golang.org/grpc/internal/xds/httpfilter/router" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" ) const ( diff --git a/xds/internal/xdsclient/xdsresource/listener_resource_type.go b/internal/xds/xdsclient/xdsresource/listener_resource_type.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/listener_resource_type.go rename to internal/xds/xdsclient/xdsresource/listener_resource_type.go index 29ff88704..100a06f97 100644 --- a/xds/internal/xdsclient/xdsresource/listener_resource_type.go +++ b/internal/xds/xdsclient/xdsresource/listener_resource_type.go @@ -22,8 +22,8 @@ import ( "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/xds/bootstrap" - xdsclient "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + xdsclient "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/logging.go b/internal/xds/xdsclient/xdsresource/logging.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/logging.go rename to internal/xds/xdsclient/xdsresource/logging.go diff --git a/xds/internal/xdsclient/xdsresource/matcher.go b/internal/xds/xdsclient/xdsresource/matcher.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/matcher.go rename to internal/xds/xdsclient/xdsresource/matcher.go diff --git a/xds/internal/xdsclient/xdsresource/matcher_path.go b/internal/xds/xdsclient/xdsresource/matcher_path.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/matcher_path.go rename to internal/xds/xdsclient/xdsresource/matcher_path.go diff --git a/xds/internal/xdsclient/xdsresource/matcher_path_test.go b/internal/xds/xdsclient/xdsresource/matcher_path_test.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/matcher_path_test.go rename to internal/xds/xdsclient/xdsresource/matcher_path_test.go diff --git a/xds/internal/xdsclient/xdsresource/matcher_test.go b/internal/xds/xdsclient/xdsresource/matcher_test.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/matcher_test.go rename to internal/xds/xdsclient/xdsresource/matcher_test.go diff --git a/xds/internal/xdsclient/xdsresource/name.go b/internal/xds/xdsclient/xdsresource/name.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/name.go rename to internal/xds/xdsclient/xdsresource/name.go diff --git a/xds/internal/xdsclient/xdsresource/name_test.go b/internal/xds/xdsclient/xdsresource/name_test.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/name_test.go rename to internal/xds/xdsclient/xdsresource/name_test.go diff --git a/xds/internal/xdsclient/xdsresource/resource_type.go b/internal/xds/xdsclient/xdsresource/resource_type.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/resource_type.go rename to internal/xds/xdsclient/xdsresource/resource_type.go index 4ecf63a1c..2c591312f 100644 --- a/xds/internal/xdsclient/xdsresource/resource_type.go +++ b/internal/xds/xdsclient/xdsresource/resource_type.go @@ -27,10 +27,10 @@ package xdsresource import ( "fmt" + xdsinternal "google.golang.org/grpc/internal/xds" "google.golang.org/grpc/internal/xds/bootstrap" - xdsinternal "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/route_config_resource_type.go b/internal/xds/xdsclient/xdsresource/route_config_resource_type.go similarity index 97% rename from xds/internal/xdsclient/xdsresource/route_config_resource_type.go rename to internal/xds/xdsclient/xdsresource/route_config_resource_type.go index 344932e93..912dc1b76 100644 --- a/xds/internal/xdsclient/xdsresource/route_config_resource_type.go +++ b/internal/xds/xdsclient/xdsresource/route_config_resource_type.go @@ -19,8 +19,8 @@ package xdsresource import ( "google.golang.org/grpc/internal/pretty" - xdsclient "google.golang.org/grpc/xds/internal/clients/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + xdsclient "google.golang.org/grpc/internal/xds/clients/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/test_utils_test.go b/internal/xds/xdsclient/xdsresource/test_utils_test.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/test_utils_test.go rename to internal/xds/xdsclient/xdsresource/test_utils_test.go diff --git a/xds/internal/xdsclient/xdsresource/tests/unmarshal_cds_test.go b/internal/xds/xdsclient/xdsresource/tests/unmarshal_cds_test.go similarity index 95% rename from xds/internal/xdsclient/xdsresource/tests/unmarshal_cds_test.go rename to internal/xds/xdsclient/xdsresource/tests/unmarshal_cds_test.go index c9eaef5ad..c25ddf62a 100644 --- a/xds/internal/xdsclient/xdsresource/tests/unmarshal_cds_test.go +++ b/internal/xds/xdsclient/xdsresource/tests/unmarshal_cds_test.go @@ -32,11 +32,11 @@ import ( iserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/balancer/wrrlocality" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/balancer/wrrlocality" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/structpb" @@ -142,7 +142,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { ClusterName: clusterName, ClusterType: xdsresource.ClusterTypeLogicalDNS, DNSHostName: "dns_host:8080", - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -171,7 +171,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { ClusterName: clusterName, ClusterType: xdsresource.ClusterTypeAggregate, PrioritizedClusterNames: []string{"a", "b", "c"}, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -187,7 +187,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { cluster: e2e.DefaultCluster(clusterName, "", e2e.SecurityLevelNone), wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -204,7 +204,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -227,7 +227,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { ClusterName: clusterName, EDSServiceName: serviceName, LRSServerConfig: serverCfg, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -266,7 +266,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { EDSServiceName: serviceName, LRSServerConfig: serverCfg, MaxRequests: func() *uint32 { i := uint32(512); return &i }(), - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -287,7 +287,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: "ring_hash_experimental", @@ -315,7 +315,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: "least_request_experimental", @@ -340,7 +340,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: "ring_hash_experimental", @@ -373,7 +373,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: "least_request_experimental", @@ -412,7 +412,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: "ring_hash_experimental", @@ -448,7 +448,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -488,7 +488,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: wrrlocality.Name, @@ -537,7 +537,7 @@ func (s) TestValidateCluster_Success(t *testing.T) { wantUpdate: xdsresource.ClusterUpdate{ ClusterName: clusterName, EDSServiceName: serviceName, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, wantLBConfig: &iserviceconfig.BalancerConfig{ Name: "ring_hash_experimental", diff --git a/xds/internal/xdsclient/xdsresource/type.go b/internal/xds/xdsclient/xdsresource/type.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/type.go rename to internal/xds/xdsclient/xdsresource/type.go index 994204101..7f85c1da2 100644 --- a/xds/internal/xdsclient/xdsresource/type.go +++ b/internal/xds/xdsclient/xdsresource/type.go @@ -21,7 +21,7 @@ import ( "time" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/type_cds.go b/internal/xds/xdsclient/xdsresource/type_cds.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/type_cds.go rename to internal/xds/xdsclient/xdsresource/type_cds.go diff --git a/xds/internal/xdsclient/xdsresource/type_eds.go b/internal/xds/xdsclient/xdsresource/type_eds.go similarity index 97% rename from xds/internal/xdsclient/xdsresource/type_eds.go rename to internal/xds/xdsclient/xdsresource/type_eds.go index 12294626f..42eea0090 100644 --- a/xds/internal/xdsclient/xdsresource/type_eds.go +++ b/internal/xds/xdsclient/xdsresource/type_eds.go @@ -18,7 +18,7 @@ package xdsresource import ( - "google.golang.org/grpc/xds/internal/clients" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/type_lds.go b/internal/xds/xdsclient/xdsresource/type_lds.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/type_lds.go rename to internal/xds/xdsclient/xdsresource/type_lds.go index a71e38ea9..a2e057b0e 100644 --- a/xds/internal/xdsclient/xdsresource/type_lds.go +++ b/internal/xds/xdsclient/xdsresource/type_lds.go @@ -20,7 +20,7 @@ package xdsresource import ( "time" - "google.golang.org/grpc/xds/internal/httpfilter" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/type_rds.go b/internal/xds/xdsclient/xdsresource/type_rds.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/type_rds.go rename to internal/xds/xdsclient/xdsresource/type_rds.go index 42da39126..44bc27891 100644 --- a/xds/internal/xdsclient/xdsresource/type_rds.go +++ b/internal/xds/xdsclient/xdsresource/type_rds.go @@ -22,9 +22,9 @@ import ( "time" "google.golang.org/grpc/codes" + "google.golang.org/grpc/internal/xds/clusterspecifier" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/grpc/internal/xds/matcher" - "google.golang.org/grpc/xds/internal/clusterspecifier" - "google.golang.org/grpc/xds/internal/httpfilter" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_cds.go b/internal/xds/xdsclient/xdsresource/unmarshal_cds.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/unmarshal_cds.go rename to internal/xds/xdsclient/xdsresource/unmarshal_cds.go index 43247c5b8..d7133c996 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_cds.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_cds.go @@ -36,8 +36,8 @@ import ( iserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/internal/xds/matcher" - "google.golang.org/grpc/xds/internal/xdsclient/xdslbregistry" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient/xdslbregistry" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_cds_test.go b/internal/xds/xdsclient/xdsresource/unmarshal_cds_test.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/unmarshal_cds_test.go rename to internal/xds/xdsclient/xdsresource/unmarshal_cds_test.go index 513241e0a..0fb70d635 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_cds_test.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_cds_test.go @@ -28,10 +28,10 @@ import ( "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/testutils" + xdsinternal "google.golang.org/grpc/internal/xds" "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/internal/xds/matcher" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" @@ -935,7 +935,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { RootInstanceName: rootPluginInstance, RootCertName: rootCertName, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -977,7 +977,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { RootInstanceName: rootPluginInstance, RootCertName: rootCertName, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1023,7 +1023,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { IdentityInstanceName: identityPluginInstance, IdentityCertName: identityCertName, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1076,7 +1076,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { IdentityInstanceName: identityPluginInstance, IdentityCertName: identityCertName, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1121,7 +1121,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { IdentityInstanceName: identityPluginInstance, IdentityCertName: identityCertName, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1223,7 +1223,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { matcher.StringMatcherForTesting(nil, nil, nil, newStringP(sanContains), nil, false), }, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1290,7 +1290,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { matcher.StringMatcherForTesting(nil, nil, nil, newStringP(sanContains), nil, false), }, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1354,7 +1354,7 @@ func (s) TestValidateClusterWithSecurityConfig(t *testing.T) { matcher.StringMatcherForTesting(nil, nil, nil, newStringP(sanContains), nil, false), }, }, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, } @@ -1553,7 +1553,7 @@ func (s) TestUnmarshalCluster(t *testing.T) { EDSServiceName: v3Service, LRSServerConfig: serverCfg, Raw: v3ClusterAny, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1566,7 +1566,7 @@ func (s) TestUnmarshalCluster(t *testing.T) { EDSServiceName: v3Service, LRSServerConfig: serverCfg, Raw: v3ClusterAny, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { @@ -1579,7 +1579,7 @@ func (s) TestUnmarshalCluster(t *testing.T) { EDSServiceName: v3Service, LRSServerConfig: serverCfg, Raw: v3ClusterAnyWithEDSConfigSourceSelf, - TelemetryLabels: internal.UnknownCSMLabels, + TelemetryLabels: xdsinternal.UnknownCSMLabels, }, }, { diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_eds.go b/internal/xds/xdsclient/xdsresource/unmarshal_eds.go similarity index 98% rename from xds/internal/xdsclient/xdsresource/unmarshal_eds.go rename to internal/xds/xdsclient/xdsresource/unmarshal_eds.go index d56b42dd3..3e1e59cd7 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_eds.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_eds.go @@ -28,8 +28,8 @@ import ( v3typepb "github.com/envoyproxy/go-control-plane/envoy/type/v3" "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/pretty" - "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/clients" + xdsinternal "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/clients" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) @@ -170,7 +170,7 @@ func parseEDSRespProto(m *v3endpointpb.ClusterLoadAssignment) (EndpointsUpdate, Zone: l.Zone, SubZone: l.SubZone, } - lidStr := internal.LocalityString(lid) + lidStr := xdsinternal.LocalityString(lid) // "Since an xDS configuration can place a given locality under multiple // priorities, it is possible to see locality weight attributes with diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_eds_test.go b/internal/xds/xdsclient/xdsresource/unmarshal_eds_test.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/unmarshal_eds_test.go rename to internal/xds/xdsclient/xdsresource/unmarshal_eds_test.go index f38f69617..4eb088dcc 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_eds_test.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_eds_test.go @@ -32,8 +32,8 @@ import ( "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/testutils" - "google.golang.org/grpc/xds/internal/clients" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/clients" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_lds.go b/internal/xds/xdsclient/xdsresource/unmarshal_lds.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/unmarshal_lds.go rename to internal/xds/xdsclient/xdsresource/unmarshal_lds.go index 475300cef..25c607b48 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_lds.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_lds.go @@ -27,7 +27,7 @@ import ( v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" - "google.golang.org/grpc/xds/internal/httpfilter" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_lds_test.go b/internal/xds/xdsclient/xdsresource/unmarshal_lds_test.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/unmarshal_lds_test.go rename to internal/xds/xdsclient/xdsresource/unmarshal_lds_test.go index 900afdd31..b652c7227 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_lds_test.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_lds_test.go @@ -28,8 +28,8 @@ import ( "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" - "google.golang.org/grpc/xds/internal/httpfilter" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/httpfilter" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/durationpb" @@ -48,8 +48,8 @@ import ( v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" v3matcherpb "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" - _ "google.golang.org/grpc/xds/internal/httpfilter/rbac" // Register the RBAC HTTP filter. - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter. + _ "google.golang.org/grpc/internal/xds/httpfilter/rbac" // Register the RBAC HTTP filter. + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter. ) func (s) TestUnmarshalListener_ClientSide(t *testing.T) { diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_rds.go b/internal/xds/xdsclient/xdsresource/unmarshal_rds.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/unmarshal_rds.go rename to internal/xds/xdsclient/xdsresource/unmarshal_rds.go index db862514e..beab03ebb 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_rds.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_rds.go @@ -25,8 +25,8 @@ import ( "time" "google.golang.org/grpc/codes" + "google.golang.org/grpc/internal/xds/clusterspecifier" "google.golang.org/grpc/internal/xds/matcher" - "google.golang.org/grpc/xds/internal/clusterspecifier" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go b/internal/xds/xdsclient/xdsresource/unmarshal_rds_test.go similarity index 99% rename from xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go rename to internal/xds/xdsclient/xdsresource/unmarshal_rds_test.go index c545ba45e..622ef7df0 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go +++ b/internal/xds/xdsclient/xdsresource/unmarshal_rds_test.go @@ -31,10 +31,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/testutils" + "google.golang.org/grpc/internal/xds/clusterspecifier" + "google.golang.org/grpc/internal/xds/httpfilter" "google.golang.org/grpc/internal/xds/matcher" - "google.golang.org/grpc/xds/internal/clusterspecifier" - "google.golang.org/grpc/xds/internal/httpfilter" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/durationpb" diff --git a/xds/internal/xdsclient/xdsresource/version/version.go b/internal/xds/xdsclient/xdsresource/version/version.go similarity index 100% rename from xds/internal/xdsclient/xdsresource/version/version.go rename to internal/xds/xdsclient/xdsresource/version/version.go diff --git a/interop/observability/go.sum b/interop/observability/go.sum index 471bf15d2..4c0560786 100644 --- a/interop/observability/go.sum +++ b/interop/observability/go.sum @@ -919,9 +919,11 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= +github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA= github.com/envoyproxy/go-control-plane/envoy v1.32.2/go.mod h1:eR2SOX2IedqlPvmiKjUH7Wu//S602JKI7HPC/L3SRq8= github.com/envoyproxy/go-control-plane/envoy v1.32.3/go.mod h1:F6hWupPfh75TBXGKA++MCT/CZHFq5r9/uwt/kQYkZfE= +github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A= github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw= github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -1255,6 +1257,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= diff --git a/xds/csds/csds.go b/xds/csds/csds.go index 3d8398a72..603819d6c 100644 --- a/xds/csds/csds.go +++ b/xds/csds/csds.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" internalgrpclog "google.golang.org/grpc/internal/grpclog" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/xdsclient" v3statusgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" diff --git a/xds/csds/csds_e2e_test.go b/xds/csds/csds_e2e_test.go index a9654b20b..d09deeb26 100644 --- a/xds/csds/csds_e2e_test.go +++ b/xds/csds/csds_e2e_test.go @@ -36,9 +36,9 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/xds/csds" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/anypb" @@ -52,7 +52,7 @@ import ( v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" v3statuspbgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter ) const defaultTestTimeout = 5 * time.Second diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go index f75c022d9..f1a026491 100644 --- a/xds/googledirectpath/googlec2p.go +++ b/xds/googledirectpath/googlec2p.go @@ -38,8 +38,8 @@ import ( "google.golang.org/grpc/internal/googlecloud" internalgrpclog "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/resolver" - "google.golang.org/grpc/xds/internal/xdsclient" _ "google.golang.org/grpc/xds" // To register xds resolvers and balancers. ) diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go index 51f3fa4a7..adb5c3a31 100644 --- a/xds/googledirectpath/googlec2p_test.go +++ b/xds/googledirectpath/googlec2p_test.go @@ -32,10 +32,10 @@ import ( "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/grpctest" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/resolver" - "google.golang.org/grpc/xds/internal/xdsclient" ) const defaultTestTimeout = 5 * time.Second diff --git a/xds/internal/internal.go b/xds/internal/internal.go deleted file mode 100644 index 9e0b7931b..000000000 --- a/xds/internal/internal.go +++ /dev/null @@ -1,84 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// Package internal contains functions/structs shared by xds -// balancers/resolvers. -package internal - -import ( - "fmt" - - "google.golang.org/grpc/resolver" - "google.golang.org/grpc/xds/internal/clients" -) - -// LocalityString generates a string representation of clients.Locality in the -// format specified in gRFC A76. -func LocalityString(l clients.Locality) string { - return fmt.Sprintf("{region=%q, zone=%q, sub_zone=%q}", l.Region, l.Zone, l.SubZone) -} - -// IsLocalityEqual allows the values to be compared by Attributes.Equal. -func IsLocalityEqual(l clients.Locality, o any) bool { - ol, ok := o.(clients.Locality) - if !ok { - return false - } - return l.Region == ol.Region && l.Zone == ol.Zone && l.SubZone == ol.SubZone -} - -// LocalityFromString converts a string representation of clients.locality as -// specified in gRFC A76, into a LocalityID struct. -func LocalityFromString(s string) (ret clients.Locality, _ error) { - _, err := fmt.Sscanf(s, "{region=%q, zone=%q, sub_zone=%q}", &ret.Region, &ret.Zone, &ret.SubZone) - if err != nil { - return clients.Locality{}, fmt.Errorf("%s is not a well formatted locality ID, error: %v", s, err) - } - return ret, nil -} - -type localityKeyType string - -const localityKey = localityKeyType("grpc.xds.internal.address.locality") - -// GetLocalityID returns the locality ID of addr. -func GetLocalityID(addr resolver.Address) clients.Locality { - path, _ := addr.BalancerAttributes.Value(localityKey).(clients.Locality) - return path -} - -// SetLocalityID sets locality ID in addr to l. -func SetLocalityID(addr resolver.Address, l clients.Locality) resolver.Address { - addr.BalancerAttributes = addr.BalancerAttributes.WithValue(localityKey, l) - return addr -} - -// SetLocalityIDInEndpoint sets locality ID in endpoint to l. -func SetLocalityIDInEndpoint(endpoint resolver.Endpoint, l clients.Locality) resolver.Endpoint { - endpoint.Attributes = endpoint.Attributes.WithValue(localityKey, l) - return endpoint -} - -// ResourceTypeMapForTesting maps TypeUrl to corresponding ResourceType. -var ResourceTypeMapForTesting map[string]any - -// UnknownCSMLabels are TelemetryLabels emitted from CDS if CSM Telemetry Label -// data is not present in the CDS Resource. -var UnknownCSMLabels = map[string]string{ - "csm.service_name": "unknown", - "csm.service_namespace_name": "unknown", -} diff --git a/xds/server.go b/xds/server.go index 5baf91def..d49396cec 100644 --- a/xds/server.go +++ b/xds/server.go @@ -35,11 +35,11 @@ import ( istats "google.golang.org/grpc/internal/stats" "google.golang.org/grpc/internal/transport" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/server" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/server" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) const serverPrefix = "[xds-server %p] " diff --git a/xds/server_ext_test.go b/xds/server_ext_test.go index 381b93ebd..7e97a901f 100644 --- a/xds/server_ext_test.go +++ b/xds/server_ext_test.go @@ -40,10 +40,10 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/peer" "google.golang.org/grpc/status" "google.golang.org/grpc/xds" - "google.golang.org/grpc/xds/internal/xdsclient" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" diff --git a/xds/server_options.go b/xds/server_options.go index 4e3e3e9e2..c72d93ec3 100644 --- a/xds/server_options.go +++ b/xds/server_options.go @@ -24,7 +24,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient" ) type serverOptions struct { diff --git a/xds/server_resource_ext_test.go b/xds/server_resource_ext_test.go index b396eb9ff..29e68fb20 100644 --- a/xds/server_resource_ext_test.go +++ b/xds/server_resource_ext_test.go @@ -36,9 +36,9 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" "google.golang.org/grpc/xds" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/wrapperspb" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/server_security_ext_test.go b/xds/server_security_ext_test.go index 5436c2add..fbc21e556 100644 --- a/xds/server_security_ext_test.go +++ b/xds/server_security_ext_test.go @@ -35,8 +35,8 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/xds" - "google.golang.org/grpc/xds/internal/xdsclient" "google.golang.org/protobuf/types/known/wrapperspb" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/server_serving_mode_ext_test.go b/xds/server_serving_mode_ext_test.go index ce4f65f1e..678bf3808 100644 --- a/xds/server_serving_mode_ext_test.go +++ b/xds/server_serving_mode_ext_test.go @@ -33,9 +33,9 @@ import ( "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/testutils/xds/e2e/setup" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/status" "google.golang.org/grpc/xds" - "google.golang.org/grpc/xds/internal/xdsclient" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" diff --git a/xds/server_test.go b/xds/server_test.go index 921b88645..df631410a 100644 --- a/xds/server_test.go +++ b/xds/server_test.go @@ -42,13 +42,13 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" + "google.golang.org/grpc/internal/xds/xdsclient" + "google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version" v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter ) const ( diff --git a/xds/test/eds_resource_missing_test.go b/xds/test/eds_resource_missing_test.go index ce334b2cc..247270540 100644 --- a/xds/test/eds_resource_missing_test.go +++ b/xds/test/eds_resource_missing_test.go @@ -34,9 +34,9 @@ import ( "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/internal/testutils/xds/e2e/setup" "google.golang.org/grpc/internal/xds/bootstrap" + "google.golang.org/grpc/internal/xds/xdsclient" "google.golang.org/grpc/resolver" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/xdsclient" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" diff --git a/xds/xds.go b/xds/xds.go index 943d09f17..c6a1f25f7 100644 --- a/xds/xds.go +++ b/xds/xds.go @@ -38,13 +38,13 @@ import ( "google.golang.org/grpc/xds/csds" _ "google.golang.org/grpc/credentials/tls/certprovider/pemfile" // Register the file watcher certificate provider plugin. - _ "google.golang.org/grpc/xds/internal/balancer" // Register the balancers. - _ "google.golang.org/grpc/xds/internal/clusterspecifier/rls" // Register the RLS cluster specifier plugin. Note that this does not register the RLS LB policy. - _ "google.golang.org/grpc/xds/internal/httpfilter/fault" // Register the fault injection filter. - _ "google.golang.org/grpc/xds/internal/httpfilter/rbac" // Register the RBAC filter. - _ "google.golang.org/grpc/xds/internal/httpfilter/router" // Register the router filter. - _ "google.golang.org/grpc/xds/internal/resolver" // Register the xds_resolver. - _ "google.golang.org/grpc/xds/internal/xdsclient/xdslbregistry/converter" // Register the xDS LB Registry Converters. + _ "google.golang.org/grpc/internal/xds/balancer" // Register the balancers. + _ "google.golang.org/grpc/internal/xds/clusterspecifier/rls" // Register the RLS cluster specifier plugin. Note that this does not register the RLS LB policy. + _ "google.golang.org/grpc/internal/xds/httpfilter/fault" // Register the fault injection filter. + _ "google.golang.org/grpc/internal/xds/httpfilter/rbac" // Register the RBAC filter. + _ "google.golang.org/grpc/internal/xds/httpfilter/router" // Register the router filter. + _ "google.golang.org/grpc/internal/xds/resolver" // Register the xds_resolver. + _ "google.golang.org/grpc/internal/xds/xdsclient/xdslbregistry/converter" // Register the xDS LB Registry Converters. v3statusgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" )