rls: move pb.gos to grpc/internal/proto/grpc_lookup_v1 (#4993)

grpc · Nov 19, 2021 · f45e617 · f45e617
1 parent 295d7e6
commit f45e617
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...s/internal/proto/grpc_lookup_v1/rls.pb.go → internal/proto/grpc_lookup_v1/rls.pb.go b/...s/internal/proto/grpc_lookup_v1/rls.pb.go → internal/proto/grpc_lookup_v1/rls.pb.go
diff --git a/...nal/proto/grpc_lookup_v1/rls_config.pb.go → ...nal/proto/grpc_lookup_v1/rls_config.pb.go b/...nal/proto/grpc_lookup_v1/rls_config.pb.go → ...nal/proto/grpc_lookup_v1/rls_config.pb.go
diff --git a/...ernal/proto/grpc_lookup_v1/rls_grpc.pb.go → internal/proto/grpc_lookup_v1/rls_grpc.pb.go b/...ernal/proto/grpc_lookup_v1/rls_grpc.pb.go → internal/proto/grpc_lookup_v1/rls_grpc.pb.go
diff --git 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.