From 9199290ff8fee7c37283586929af39ba23dbab4b Mon Sep 17 00:00:00 2001 From: Zach Reyes <39203661+zasweq@users.noreply.github.com> Date: Fri, 3 May 2024 16:51:11 -0400 Subject: [PATCH] xds: Move bootstrap config to internal/xds (#7182) --- .../xds}/bootstrap/bootstrap.go | 49 +------------ .../xds}/bootstrap/bootstrap_test.go | 40 ----------- .../xds}/bootstrap/logging.go | 0 .../xds}/bootstrap/template.go | 0 .../xds}/bootstrap/template_test.go | 0 .../xds/bootstrap}/tlscreds/bundle.go | 0 .../bootstrap}/tlscreds/bundle_ext_test.go | 2 +- .../xds/bootstrap}/tlscreds/bundle_test.go | 0 xds/bootstrap/bootstrap_test.go | 39 +++++++++++ xds/bootstrap/credentials.go | 70 +++++++++++++++++++ xds/googledirectpath/googlec2p.go | 2 +- xds/googledirectpath/googlec2p_test.go | 2 +- .../balancer/cdsbalancer/cdsbalancer_test.go | 2 +- .../balancer/clusterimpl/balancer_test.go | 2 +- .../balancer/clusterimpl/clusterimpl.go | 2 +- xds/internal/balancer/clusterimpl/config.go | 2 +- .../balancer/clusterimpl/config_test.go | 2 +- .../balancer/clusterresolver/config.go | 2 +- .../balancer/clusterresolver/config_test.go | 2 +- .../e2e_test/aggregate_cluster_test.go | 2 +- .../clusterresolver/e2e_test/eds_impl_test.go | 2 +- xds/internal/resolver/xds_resolver.go | 2 +- xds/internal/resolver/xds_resolver_test.go | 2 +- xds/internal/server/listener_wrapper.go | 2 +- xds/internal/testutils/fakeclient/client.go | 2 +- xds/internal/testutils/testutils.go | 2 +- xds/internal/xdsclient/authority.go | 2 +- xds/internal/xdsclient/authority_test.go | 2 +- xds/internal/xdsclient/client.go | 2 +- xds/internal/xdsclient/client_new.go | 2 +- xds/internal/xdsclient/clientimpl.go | 2 +- .../xdsclient/clientimpl_authority.go | 2 +- .../xdsclient/clientimpl_loadreport.go | 2 +- xds/internal/xdsclient/loadreport_test.go | 2 +- xds/internal/xdsclient/singleton.go | 2 +- .../xdsclient/tests/authority_test.go | 2 +- .../xdsclient/tests/cds_watchers_test.go | 2 +- .../xdsclient/tests/eds_watchers_test.go | 2 +- .../xdsclient/tests/lds_watchers_test.go | 2 +- .../xdsclient/tests/rds_watchers_test.go | 2 +- .../xdsclient/tests/resource_update_test.go | 2 +- xds/internal/xdsclient/transport/transport.go | 2 +- .../xdsclient/transport/transport_new_test.go | 2 +- .../xdsresource/listener_resource_type.go | 2 +- .../xdsclient/xdsresource/resource_type.go | 2 +- xds/server.go | 2 +- 46 files changed, 148 insertions(+), 124 deletions(-) rename {xds/internal/xdsclient => internal/xds}/bootstrap/bootstrap.go (93%) rename {xds/internal/xdsclient => internal/xds}/bootstrap/bootstrap_test.go (96%) rename {xds/internal/xdsclient => internal/xds}/bootstrap/logging.go (100%) rename {xds/internal/xdsclient => internal/xds}/bootstrap/template.go (100%) rename {xds/internal/xdsclient => internal/xds}/bootstrap/template_test.go (100%) rename {xds/internal/xdsclient => internal/xds/bootstrap}/tlscreds/bundle.go (100%) rename {xds/internal/xdsclient => internal/xds/bootstrap}/tlscreds/bundle_ext_test.go (99%) rename {xds/internal/xdsclient => internal/xds/bootstrap}/tlscreds/bundle_test.go (100%) create mode 100644 xds/bootstrap/credentials.go diff --git a/xds/internal/xdsclient/bootstrap/bootstrap.go b/internal/xds/bootstrap/bootstrap.go similarity index 93% rename from xds/internal/xdsclient/bootstrap/bootstrap.go rename to internal/xds/bootstrap/bootstrap.go index e4a749048e17..f89f03dd9ac9 100644 --- a/xds/internal/xdsclient/bootstrap/bootstrap.go +++ b/internal/xds/bootstrap/bootstrap.go @@ -28,18 +28,15 @@ import ( "os" "strings" - v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" "google.golang.org/grpc" - "google.golang.org/grpc/credentials" - "google.golang.org/grpc/credentials/google" - "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/tls/certprovider" "google.golang.org/grpc/internal" "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/xds/bootstrap" - "google.golang.org/grpc/xds/internal/xdsclient/tlscreds" "google.golang.org/protobuf/encoding/protojson" + + v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" ) const ( @@ -58,51 +55,9 @@ const ( clientFeatureResourceWrapper = "xds.config.resource-in-sotw" ) -func init() { - bootstrap.RegisterCredentials(&insecureCredsBuilder{}) - bootstrap.RegisterCredentials(&googleDefaultCredsBuilder{}) - bootstrap.RegisterCredentials(&tlsCredsBuilder{}) -} - // For overriding in unit tests. var bootstrapFileReadFunc = os.ReadFile -// insecureCredsBuilder implements the `Credentials` interface defined in -// package `xds/bootstrap` and encapsulates an insecure credential. -type insecureCredsBuilder struct{} - -func (i *insecureCredsBuilder) Build(json.RawMessage) (credentials.Bundle, func(), error) { - return insecure.NewBundle(), func() {}, nil -} - -func (i *insecureCredsBuilder) Name() string { - return "insecure" -} - -// tlsCredsBuilder implements the `Credentials` interface defined in -// package `xds/bootstrap` and encapsulates a TLS credential. -type tlsCredsBuilder struct{} - -func (t *tlsCredsBuilder) Build(config json.RawMessage) (credentials.Bundle, func(), error) { - return tlscreds.NewBundle(config) -} - -func (t *tlsCredsBuilder) Name() string { - return "tls" -} - -// googleDefaultCredsBuilder implements the `Credentials` interface defined in -// package `xds/boostrap` and encapsulates a Google Default credential. -type googleDefaultCredsBuilder struct{} - -func (d *googleDefaultCredsBuilder) Build(json.RawMessage) (credentials.Bundle, func(), error) { - return google.NewDefaultCredentials(), func() {}, nil -} - -func (d *googleDefaultCredsBuilder) Name() string { - return "google_default" -} - // ChannelCreds contains the credentials to be used while communicating with an // xDS server. It is also used to dedup servers with the same server URI. type ChannelCreds struct { diff --git a/xds/internal/xdsclient/bootstrap/bootstrap_test.go b/internal/xds/bootstrap/bootstrap_test.go similarity index 96% rename from xds/internal/xdsclient/bootstrap/bootstrap_test.go rename to internal/xds/bootstrap/bootstrap_test.go index 8933f4303bc8..68a4536d3d68 100644 --- a/xds/internal/xdsclient/bootstrap/bootstrap_test.go +++ b/internal/xds/bootstrap/bootstrap_test.go @@ -1018,43 +1018,3 @@ func TestDefaultBundles(t *testing.T) { }) } } - -func TestCredsBuilders(t *testing.T) { - tests := []struct { - typename string - builder bootstrap.Credentials - }{ - {"google_default", &googleDefaultCredsBuilder{}}, - {"insecure", &insecureCredsBuilder{}}, - {"tls", &tlsCredsBuilder{}}, - } - - for _, test := range tests { - t.Run(test.typename, func(t *testing.T) { - if got, want := test.builder.Name(), test.typename; got != want { - t.Errorf("%T.Name = %v, want %v", test.builder, got, want) - } - - _, stop, err := test.builder.Build(nil) - if err != nil { - t.Fatalf("%T.Build failed: %v", test.builder, err) - } - stop() - }) - } -} - -func TestTlsCredsBuilder(t *testing.T) { - tls := &tlsCredsBuilder{} - _, stop, err := tls.Build(json.RawMessage(`{}`)) - if err != nil { - t.Fatalf("tls.Build() failed with error %s when expected to succeed", err) - } - stop() - - if _, stop, err := tls.Build(json.RawMessage(`{"ca_certificate_file":"/ca_certificates.pem","refresh_interval": "asdf"}`)); err == nil { - t.Errorf("tls.Build() succeeded with an invalid refresh interval, when expected to fail") - stop() - } - // package internal/xdsclient/tlscreds has tests for config validity. -} diff --git a/xds/internal/xdsclient/bootstrap/logging.go b/internal/xds/bootstrap/logging.go similarity index 100% rename from xds/internal/xdsclient/bootstrap/logging.go rename to internal/xds/bootstrap/logging.go diff --git a/xds/internal/xdsclient/bootstrap/template.go b/internal/xds/bootstrap/template.go similarity index 100% rename from xds/internal/xdsclient/bootstrap/template.go rename to internal/xds/bootstrap/template.go diff --git a/xds/internal/xdsclient/bootstrap/template_test.go b/internal/xds/bootstrap/template_test.go similarity index 100% rename from xds/internal/xdsclient/bootstrap/template_test.go rename to internal/xds/bootstrap/template_test.go diff --git a/xds/internal/xdsclient/tlscreds/bundle.go b/internal/xds/bootstrap/tlscreds/bundle.go similarity index 100% rename from xds/internal/xdsclient/tlscreds/bundle.go rename to internal/xds/bootstrap/tlscreds/bundle.go diff --git a/xds/internal/xdsclient/tlscreds/bundle_ext_test.go b/internal/xds/bootstrap/tlscreds/bundle_ext_test.go similarity index 99% rename from xds/internal/xdsclient/tlscreds/bundle_ext_test.go rename to internal/xds/bootstrap/tlscreds/bundle_ext_test.go index 1d7d7fb1909f..c6cd40246219 100644 --- a/xds/internal/xdsclient/tlscreds/bundle_ext_test.go +++ b/internal/xds/bootstrap/tlscreds/bundle_ext_test.go @@ -33,11 +33,11 @@ import ( "google.golang.org/grpc/internal/grpctest" "google.golang.org/grpc/internal/stubserver" "google.golang.org/grpc/internal/testutils/xds/e2e" + "google.golang.org/grpc/internal/xds/bootstrap/tlscreds" testgrpc "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/status" "google.golang.org/grpc/testdata" - "google.golang.org/grpc/xds/internal/xdsclient/tlscreds" ) const defaultTestTimeout = 5 * time.Second diff --git a/xds/internal/xdsclient/tlscreds/bundle_test.go b/internal/xds/bootstrap/tlscreds/bundle_test.go similarity index 100% rename from xds/internal/xdsclient/tlscreds/bundle_test.go rename to internal/xds/bootstrap/tlscreds/bundle_test.go diff --git a/xds/bootstrap/bootstrap_test.go b/xds/bootstrap/bootstrap_test.go index 1afc3ce7075a..d1f7a1b64ee5 100644 --- a/xds/bootstrap/bootstrap_test.go +++ b/xds/bootstrap/bootstrap_test.go @@ -61,3 +61,42 @@ func TestRegisterNew(t *testing.T) { t.Errorf("Build config = %v, want %v", got, want) } } + +func TestCredsBuilders(t *testing.T) { + tests := []struct { + typename string + builder Credentials + }{ + {"google_default", &googleDefaultCredsBuilder{}}, + {"insecure", &insecureCredsBuilder{}}, + {"tls", &tlsCredsBuilder{}}, + } + + for _, test := range tests { + t.Run(test.typename, func(t *testing.T) { + if got, want := test.builder.Name(), test.typename; got != want { + t.Errorf("%T.Name = %v, want %v", test.builder, got, want) + } + + _, stop, err := test.builder.Build(nil) + if err != nil { + t.Fatalf("%T.Build failed: %v", test.builder, err) + } + stop() + }) + } +} + +func TestTlsCredsBuilder(t *testing.T) { + tls := &tlsCredsBuilder{} + _, stop, err := tls.Build(json.RawMessage(`{}`)) + if err != nil { + t.Fatalf("tls.Build() failed with error %s when expected to succeed", err) + } + stop() + + if _, stop, err := tls.Build(json.RawMessage(`{"ca_certificate_file":"/ca_certificates.pem","refresh_interval": "asdf"}`)); err == nil { + t.Errorf("tls.Build() succeeded with an invalid refresh interval, when expected to fail") + stop() + } +} diff --git a/xds/bootstrap/credentials.go b/xds/bootstrap/credentials.go new file mode 100644 index 000000000000..cb022b45de18 --- /dev/null +++ b/xds/bootstrap/credentials.go @@ -0,0 +1,70 @@ +/* + * + * Copyright 2024 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 bootstrap + +import ( + "encoding/json" + + "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/google" + "google.golang.org/grpc/credentials/insecure" + "google.golang.org/grpc/internal/xds/bootstrap/tlscreds" +) + +func init() { + RegisterCredentials(&insecureCredsBuilder{}) + RegisterCredentials(&googleDefaultCredsBuilder{}) + RegisterCredentials(&tlsCredsBuilder{}) +} + +// insecureCredsBuilder implements the `Credentials` interface defined in +// package `xds/bootstrap` and encapsulates an insecure credential. +type insecureCredsBuilder struct{} + +func (i *insecureCredsBuilder) Build(json.RawMessage) (credentials.Bundle, func(), error) { + return insecure.NewBundle(), func() {}, nil +} + +func (i *insecureCredsBuilder) Name() string { + return "insecure" +} + +// tlsCredsBuilder implements the `Credentials` interface defined in +// package `xds/bootstrap` and encapsulates a TLS credential. +type tlsCredsBuilder struct{} + +func (t *tlsCredsBuilder) Build(config json.RawMessage) (credentials.Bundle, func(), error) { + return tlscreds.NewBundle(config) +} + +func (t *tlsCredsBuilder) Name() string { + return "tls" +} + +// googleDefaultCredsBuilder implements the `Credentials` interface defined in +// package `xds/boostrap` and encapsulates a Google Default credential. +type googleDefaultCredsBuilder struct{} + +func (d *googleDefaultCredsBuilder) Build(json.RawMessage) (credentials.Bundle, func(), error) { + return google.NewDefaultCredentials(), func() {}, nil +} + +func (d *googleDefaultCredsBuilder) Name() string { + return "google_default" +} diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go index e842aaceded0..37b38799e78f 100644 --- a/xds/googledirectpath/googlec2p.go +++ b/xds/googledirectpath/googlec2p.go @@ -35,9 +35,9 @@ import ( "google.golang.org/grpc/internal/googlecloud" internalgrpclog "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcrand" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/resolver" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" _ "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 da6cb87d1a5a..879b585661d3 100644 --- a/xds/googledirectpath/googlec2p_test.go +++ b/xds/googledirectpath/googlec2p_test.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/envconfig" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/resolver" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/structpb" diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go index 727a98c2fa51..bdfb072531b7 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go +++ b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go @@ -37,13 +37,13 @@ import ( "google.golang.org/grpc/internal/stubserver" "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/resolver" "google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/status" "google.golang.org/grpc/xds/internal/balancer/clusterresolver" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/durationpb" diff --git a/xds/internal/balancer/clusterimpl/balancer_test.go b/xds/internal/balancer/clusterimpl/balancer_test.go index e236f692c59a..89a3607ed621 100644 --- a/xds/internal/balancer/clusterimpl/balancer_test.go +++ b/xds/internal/balancer/clusterimpl/balancer_test.go @@ -37,11 +37,11 @@ import ( internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/resolver" xdsinternal "google.golang.org/grpc/xds/internal" "google.golang.org/grpc/xds/internal/testutils/fakeclient" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" v3orcapb "github.com/cncf/xds/go/xds/data/orca/v3" diff --git a/xds/internal/balancer/clusterimpl/clusterimpl.go b/xds/internal/balancer/clusterimpl/clusterimpl.go index 9e747ba0892f..de5a0fdc95bb 100644 --- a/xds/internal/balancer/clusterimpl/clusterimpl.go +++ b/xds/internal/balancer/clusterimpl/clusterimpl.go @@ -37,12 +37,12 @@ import ( "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/internal/pretty" "google.golang.org/grpc/internal/xds" + "google.golang.org/grpc/internal/xds/bootstrap" "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/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" ) diff --git a/xds/internal/balancer/clusterimpl/config.go b/xds/internal/balancer/clusterimpl/config.go index 70f7265c15a5..134a568e0fd9 100644 --- a/xds/internal/balancer/clusterimpl/config.go +++ b/xds/internal/balancer/clusterimpl/config.go @@ -22,8 +22,8 @@ import ( "encoding/json" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/serviceconfig" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" ) // DropConfig contains the category, and drop ratio. diff --git a/xds/internal/balancer/clusterimpl/config_test.go b/xds/internal/balancer/clusterimpl/config_test.go index b001b8fdf0a4..9b60e7dd6cc9 100644 --- a/xds/internal/balancer/clusterimpl/config_test.go +++ b/xds/internal/balancer/clusterimpl/config_test.go @@ -27,7 +27,7 @@ import ( _ "google.golang.org/grpc/balancer/roundrobin" _ "google.golang.org/grpc/balancer/weightedtarget" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" ) const ( diff --git a/xds/internal/balancer/clusterresolver/config.go b/xds/internal/balancer/clusterresolver/config.go index 7f88bfacd295..7614b0fc57bd 100644 --- a/xds/internal/balancer/clusterresolver/config.go +++ b/xds/internal/balancer/clusterresolver/config.go @@ -23,9 +23,9 @@ import ( "fmt" internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/serviceconfig" "google.golang.org/grpc/xds/internal/balancer/outlierdetection" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" ) // DiscoveryMechanismType is the type of discovery mechanism. diff --git a/xds/internal/balancer/clusterresolver/config_test.go b/xds/internal/balancer/clusterresolver/config_test.go index 962ac5f21ec6..f7eec5add9a4 100644 --- a/xds/internal/balancer/clusterresolver/config_test.go +++ b/xds/internal/balancer/clusterresolver/config_test.go @@ -28,9 +28,9 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/roundrobin" iserviceconfig "google.golang.org/grpc/internal/serviceconfig" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/balancer/outlierdetection" "google.golang.org/grpc/xds/internal/balancer/ringhash" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" ) func TestDiscoveryMechanismTypeMarshalJSON(t *testing.T) { diff --git a/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go b/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go index 036f2375a12b..3b2dead52165 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go +++ b/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go @@ -35,6 +35,7 @@ import ( "google.golang.org/grpc/internal/stubserver" "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/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" @@ -42,7 +43,6 @@ import ( "google.golang.org/grpc/status" xdstestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go b/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go index e35bee84955b..4b7c67ea014b 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go +++ b/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go @@ -35,6 +35,7 @@ import ( "google.golang.org/grpc/internal/testutils" 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/peer" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" @@ -42,7 +43,6 @@ import ( "google.golang.org/grpc/status" xdstestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/xds/internal/resolver/xds_resolver.go b/xds/internal/resolver/xds_resolver.go index 6d1966230c61..928decfa1f60 100644 --- a/xds/internal/resolver/xds_resolver.go +++ b/xds/internal/resolver/xds_resolver.go @@ -31,10 +31,10 @@ import ( "google.golang.org/grpc/internal/pretty" iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/wrr" + "google.golang.org/grpc/internal/xds/bootstrap" "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/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) diff --git a/xds/internal/resolver/xds_resolver_test.go b/xds/internal/resolver/xds_resolver_test.go index 201dc9cbf736..a9780493f394 100644 --- a/xds/internal/resolver/xds_resolver_test.go +++ b/xds/internal/resolver/xds_resolver_test.go @@ -36,6 +36,7 @@ import ( "google.golang.org/grpc/internal/testutils" xdsbootstrap "google.golang.org/grpc/internal/testutils/xds/bootstrap" "google.golang.org/grpc/internal/testutils/xds/e2e" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/metadata" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" @@ -47,7 +48,6 @@ import ( rinternal "google.golang.org/grpc/xds/internal/resolver/internal" xdstestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/server/listener_wrapper.go b/xds/internal/server/listener_wrapper.go index 84f7a536856b..174b54c44117 100644 --- a/xds/internal/server/listener_wrapper.go +++ b/xds/internal/server/listener_wrapper.go @@ -32,7 +32,7 @@ import ( internalbackoff "google.golang.org/grpc/internal/backoff" internalgrpclog "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) diff --git a/xds/internal/testutils/fakeclient/client.go b/xds/internal/testutils/fakeclient/client.go index 5cdf638f0489..2c97cba9c4b7 100644 --- a/xds/internal/testutils/fakeclient/client.go +++ b/xds/internal/testutils/fakeclient/client.go @@ -23,8 +23,8 @@ import ( "context" "google.golang.org/grpc/internal/testutils" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" ) diff --git a/xds/internal/testutils/testutils.go b/xds/internal/testutils/testutils.go index 44891780e0c4..6a950fe5be26 100644 --- a/xds/internal/testutils/testutils.go +++ b/xds/internal/testutils/testutils.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" ) diff --git a/xds/internal/xdsclient/authority.go b/xds/internal/xdsclient/authority.go index db11b580c22d..6c82e70e19e2 100644 --- a/xds/internal/xdsclient/authority.go +++ b/xds/internal/xdsclient/authority.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" "google.golang.org/grpc/xds/internal/xdsclient/transport" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" diff --git a/xds/internal/xdsclient/authority_test.go b/xds/internal/xdsclient/authority_test.go index 2b19b29a11e3..17140ff37d61 100644 --- a/xds/internal/xdsclient/authority_test.go +++ b/xds/internal/xdsclient/authority_test.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc/internal/testutils/xds/e2e" "google.golang.org/grpc/xds/internal" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/testutils" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" diff --git a/xds/internal/xdsclient/client.go b/xds/internal/xdsclient/client.go index 4665f9385a14..8f211238f521 100644 --- a/xds/internal/xdsclient/client.go +++ b/xds/internal/xdsclient/client.go @@ -21,7 +21,7 @@ package xdsclient import ( - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) diff --git a/xds/internal/xdsclient/client_new.go b/xds/internal/xdsclient/client_new.go index 4717983845d4..81c14e2439fd 100644 --- a/xds/internal/xdsclient/client_new.go +++ b/xds/internal/xdsclient/client_new.go @@ -30,7 +30,7 @@ import ( "google.golang.org/grpc/internal" "google.golang.org/grpc/internal/cache" "google.golang.org/grpc/internal/grpcsync" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) diff --git a/xds/internal/xdsclient/clientimpl.go b/xds/internal/xdsclient/clientimpl.go index 1088b60301cb..7321250d6ab2 100644 --- a/xds/internal/xdsclient/clientimpl.go +++ b/xds/internal/xdsclient/clientimpl.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/internal/cache" "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/grpcsync" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" ) var _ XDSClient = &clientImpl{} diff --git a/xds/internal/xdsclient/clientimpl_authority.go b/xds/internal/xdsclient/clientimpl_authority.go index 925566cf44f3..c73e3e2e7f32 100644 --- a/xds/internal/xdsclient/clientimpl_authority.go +++ b/xds/internal/xdsclient/clientimpl_authority.go @@ -22,7 +22,7 @@ import ( "fmt" "google.golang.org/grpc/internal/grpclog" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" ) diff --git a/xds/internal/xdsclient/clientimpl_loadreport.go b/xds/internal/xdsclient/clientimpl_loadreport.go index e53df3f1edd9..ff2f5e9d6728 100644 --- a/xds/internal/xdsclient/clientimpl_loadreport.go +++ b/xds/internal/xdsclient/clientimpl_loadreport.go @@ -18,7 +18,7 @@ package xdsclient import ( - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" ) diff --git a/xds/internal/xdsclient/loadreport_test.go b/xds/internal/xdsclient/loadreport_test.go index dba99d9d26e2..a201a5a5dee2 100644 --- a/xds/internal/xdsclient/loadreport_test.go +++ b/xds/internal/xdsclient/loadreport_test.go @@ -26,9 +26,9 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/grpc/codes" "google.golang.org/grpc/internal/testutils/xds/fakeserver" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/status" xdstestutils "google.golang.org/grpc/xds/internal/testutils" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/protobuf/testing/protocmp" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/xdsclient/singleton.go b/xds/internal/xdsclient/singleton.go index 96db8ef51387..f981bfebb582 100644 --- a/xds/internal/xdsclient/singleton.go +++ b/xds/internal/xdsclient/singleton.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/grpcsync" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" ) const ( diff --git a/xds/internal/xdsclient/tests/authority_test.go b/xds/internal/xdsclient/tests/authority_test.go index 91da91f0b021..cfc0be63037a 100644 --- a/xds/internal/xdsclient/tests/authority_test.go +++ b/xds/internal/xdsclient/tests/authority_test.go @@ -26,9 +26,9 @@ import ( "github.com/google/uuid" "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/bootstrap" "google.golang.org/grpc/xds/internal/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/xds/internal/xdsclient/tests/cds_watchers_test.go index 388f3a855848..f48a74451672 100644 --- a/xds/internal/xdsclient/tests/cds_watchers_test.go +++ b/xds/internal/xdsclient/tests/cds_watchers_test.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/internal/grpcsync" "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/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" diff --git a/xds/internal/xdsclient/tests/eds_watchers_test.go b/xds/internal/xdsclient/tests/eds_watchers_test.go index 97fc428637a4..e1adf56ca0fa 100644 --- a/xds/internal/xdsclient/tests/eds_watchers_test.go +++ b/xds/internal/xdsclient/tests/eds_watchers_test.go @@ -31,10 +31,10 @@ import ( "google.golang.org/grpc/internal/grpcsync" "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" xdstestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/xds/internal/xdsclient/tests/lds_watchers_test.go b/xds/internal/xdsclient/tests/lds_watchers_test.go index 62d2abed535b..bbab416158ee 100644 --- a/xds/internal/xdsclient/tests/lds_watchers_test.go +++ b/xds/internal/xdsclient/tests/lds_watchers_test.go @@ -33,9 +33,9 @@ import ( "google.golang.org/grpc/internal/grpctest" "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/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/xdsclient/tests/rds_watchers_test.go b/xds/internal/xdsclient/tests/rds_watchers_test.go index af7c2ddccde0..51508a985189 100644 --- a/xds/internal/xdsclient/tests/rds_watchers_test.go +++ b/xds/internal/xdsclient/tests/rds_watchers_test.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/internal/grpcsync" "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/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/xds/internal/xdsclient/tests/resource_update_test.go b/xds/internal/xdsclient/tests/resource_update_test.go index 33282f964a6f..783e9e413564 100644 --- a/xds/internal/xdsclient/tests/resource_update_test.go +++ b/xds/internal/xdsclient/tests/resource_update_test.go @@ -31,10 +31,10 @@ import ( "google.golang.org/grpc/internal/testutils" "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" xdstestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/xdsclient" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" diff --git a/xds/internal/xdsclient/transport/transport.go b/xds/internal/xdsclient/transport/transport.go index 8f96a452b01e..421ba78074c0 100644 --- a/xds/internal/xdsclient/transport/transport.go +++ b/xds/internal/xdsclient/transport/transport.go @@ -33,8 +33,8 @@ import ( "google.golang.org/grpc/internal/buffer" "google.golang.org/grpc/internal/grpclog" "google.golang.org/grpc/internal/pretty" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/keepalive" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/load" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/xdsclient/transport/transport_new_test.go b/xds/internal/xdsclient/transport/transport_new_test.go index 2f6c3148a267..8110828739aa 100644 --- a/xds/internal/xdsclient/transport/transport_new_test.go +++ b/xds/internal/xdsclient/transport/transport_new_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/testutils" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/transport" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/xds/internal/xdsclient/xdsresource/listener_resource_type.go b/xds/internal/xdsclient/xdsresource/listener_resource_type.go index ea6c459c5bf0..4337e4e063f7 100644 --- a/xds/internal/xdsclient/xdsresource/listener_resource_type.go +++ b/xds/internal/xdsclient/xdsresource/listener_resource_type.go @@ -21,7 +21,7 @@ import ( "fmt" "google.golang.org/grpc/internal/pretty" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/internal/xds/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" diff --git a/xds/internal/xdsclient/xdsresource/resource_type.go b/xds/internal/xdsclient/xdsresource/resource_type.go index fd912726fc4f..cf1dff7fe748 100644 --- a/xds/internal/xdsclient/xdsresource/resource_type.go +++ b/xds/internal/xdsclient/xdsresource/resource_type.go @@ -28,8 +28,8 @@ import ( "fmt" "google.golang.org/grpc/internal" + "google.golang.org/grpc/internal/xds/bootstrap" xdsinternal "google.golang.org/grpc/xds/internal" - "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/xds/server.go b/xds/server.go index 6b31610c19b5..b5eb806207ad 100644 --- a/xds/server.go +++ b/xds/server.go @@ -31,11 +31,11 @@ import ( "google.golang.org/grpc/internal/grpcsync" iresolver "google.golang.org/grpc/internal/resolver" "google.golang.org/grpc/internal/transport" + "google.golang.org/grpc/internal/xds/bootstrap" "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/bootstrap" "google.golang.org/grpc/xds/internal/xdsclient/xdsresource" )