From f45e61797429f3d78ba0ae6f06527e2f98653f89 Mon Sep 17 00:00:00 2001 From: Easwar Swaminathan Date: Thu, 18 Nov 2021 16:51:41 -0800 Subject: [PATCH] rls: move pb.gos to grpc/internal/proto/grpc_lookup_v1 (#4993) --- balancer/rls/internal/client.go | 2 +- balancer/rls/internal/client_test.go | 2 +- balancer/rls/internal/config.go | 3 +-- balancer/rls/internal/keys/builder.go | 2 +- balancer/rls/internal/keys/builder_test.go | 2 +- balancer/rls/internal/picker_test.go | 2 +- balancer/rls/internal/testutils/fakeserver/fakeserver.go | 4 ++-- .../rls/internal => internal}/proto/grpc_lookup_v1/rls.pb.go | 0 .../proto/grpc_lookup_v1/rls_config.pb.go | 0 .../internal => internal}/proto/grpc_lookup_v1/rls_grpc.pb.go | 0 regenerate.sh | 4 ++-- 11 files changed, 10 insertions(+), 11 deletions(-) rename {balancer/rls/internal => internal}/proto/grpc_lookup_v1/rls.pb.go (100%) rename {balancer/rls/internal => internal}/proto/grpc_lookup_v1/rls_config.pb.go (100%) rename {balancer/rls/internal => internal}/proto/grpc_lookup_v1/rls_grpc.pb.go (100%) diff --git a/balancer/rls/internal/client.go b/balancer/rls/internal/client.go index 4e263adc259..af22bda188c 100644 --- a/balancer/rls/internal/client.go +++ b/balancer/rls/internal/client.go @@ -23,7 +23,7 @@ import ( "time" "google.golang.org/grpc" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" ) // For gRPC services using RLS, the value of target_type in the diff --git a/balancer/rls/internal/client_test.go b/balancer/rls/internal/client_test.go index 6c8af6a6ab8..9a805c77ca3 100644 --- a/balancer/rls/internal/client_test.go +++ b/balancer/rls/internal/client_test.go @@ -28,9 +28,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/google/go-cmp/cmp" "google.golang.org/grpc" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/balancer/rls/internal/testutils/fakeserver" "google.golang.org/grpc/codes" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/status" ) diff --git a/balancer/rls/internal/config.go b/balancer/rls/internal/config.go index b27a2970f08..e3f261d4026 100644 --- a/balancer/rls/internal/config.go +++ b/balancer/rls/internal/config.go @@ -28,10 +28,9 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/ptypes" durationpb "github.com/golang/protobuf/ptypes/duration" - "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/rls/internal/keys" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" ) diff --git a/balancer/rls/internal/keys/builder.go b/balancer/rls/internal/keys/builder.go index 24767b405f0..55cf7478c88 100644 --- a/balancer/rls/internal/keys/builder.go +++ b/balancer/rls/internal/keys/builder.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/metadata" ) diff --git a/balancer/rls/internal/keys/builder_test.go b/balancer/rls/internal/keys/builder_test.go index a5cad29e0c9..d7b74b3c0dd 100644 --- a/balancer/rls/internal/keys/builder_test.go +++ b/balancer/rls/internal/keys/builder_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/metadata" ) diff --git a/balancer/rls/internal/picker_test.go b/balancer/rls/internal/picker_test.go index 762eb5fd80e..f115be98a39 100644 --- a/balancer/rls/internal/picker_test.go +++ b/balancer/rls/internal/picker_test.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/rls/internal/cache" "google.golang.org/grpc/balancer/rls/internal/keys" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/internal/grpcrand" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/metadata" ) diff --git a/balancer/rls/internal/testutils/fakeserver/fakeserver.go b/balancer/rls/internal/testutils/fakeserver/fakeserver.go index 479e3036468..8554ffbf78b 100644 --- a/balancer/rls/internal/testutils/fakeserver/fakeserver.go +++ b/balancer/rls/internal/testutils/fakeserver/fakeserver.go @@ -28,8 +28,8 @@ import ( "time" "google.golang.org/grpc" - rlsgrpc "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" - rlspb "google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1" + rlsgrpc "google.golang.org/grpc/internal/proto/grpc_lookup_v1" + rlspb "google.golang.org/grpc/internal/proto/grpc_lookup_v1" "google.golang.org/grpc/internal/testutils" ) diff --git a/balancer/rls/internal/proto/grpc_lookup_v1/rls.pb.go b/internal/proto/grpc_lookup_v1/rls.pb.go similarity index 100% rename from balancer/rls/internal/proto/grpc_lookup_v1/rls.pb.go rename to internal/proto/grpc_lookup_v1/rls.pb.go diff --git a/balancer/rls/internal/proto/grpc_lookup_v1/rls_config.pb.go b/internal/proto/grpc_lookup_v1/rls_config.pb.go similarity index 100% rename from balancer/rls/internal/proto/grpc_lookup_v1/rls_config.pb.go rename to internal/proto/grpc_lookup_v1/rls_config.pb.go diff --git a/balancer/rls/internal/proto/grpc_lookup_v1/rls_grpc.pb.go b/internal/proto/grpc_lookup_v1/rls_grpc.pb.go similarity index 100% rename from balancer/rls/internal/proto/grpc_lookup_v1/rls_grpc.pb.go rename to internal/proto/grpc_lookup_v1/rls_grpc.pb.go diff --git a/regenerate.sh b/regenerate.sh index dfd3226a1d9..a0a71aae968 100755 --- a/regenerate.sh +++ b/regenerate.sh @@ -102,8 +102,8 @@ done # The go_package option in grpc/lookup/v1/rls.proto doesn't match the # current location. Move it into the right place. -mkdir -p ${WORKDIR}/out/google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1 -mv ${WORKDIR}/out/google.golang.org/grpc/lookup/grpc_lookup_v1/* ${WORKDIR}/out/google.golang.org/grpc/balancer/rls/internal/proto/grpc_lookup_v1 +mkdir -p ${WORKDIR}/out/google.golang.org/grpc/internal/proto/grpc_lookup_v1 +mv ${WORKDIR}/out/google.golang.org/grpc/lookup/grpc_lookup_v1/* ${WORKDIR}/out/google.golang.org/grpc/internal/proto/grpc_lookup_v1 # grpc_testingv3/testv3.pb.go is not re-generated because it was # intentionally generated by an older version of protoc-gen-go.