xds: use generated protos from github.com/cncf/udpa/go

The upstream repo contains generated Go packages, so there's no need to generate a separate version here.
grpc · Mar 12, 2020 · c987c9b · c987c9b
1 parent 4e487c1
commit c987c9b
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 537 deletions.
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module google.golang.org/grpc
 go 1.11
 
 require (
+	github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f
 	github.com/envoyproxy/go-control-plane v0.9.4
 	github.com/envoyproxy/protoc-gen-validate v0.1.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b

diff --git a/xds/internal/balancer/edsbalancer/balancergroup.go b/xds/internal/balancer/edsbalancer/balancergroup.go
@@ -21,6 +21,7 @@ import (
 	"sync"
 	"time"
 
+	orcapb "github.com/cncf/udpa/go/udpa/data/orca/v1"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 	"google.golang.org/grpc/connectivity"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/xds/internal"
 	"google.golang.org/grpc/xds/internal/balancer/lrs"
-	orcapb "google.golang.org/grpc/xds/internal/proto/udpa/data/orca/v1"
 )
 
 // subBalancerWithConfig is used to keep the configurations that will be used to start

diff --git a/xds/internal/balancer/edsbalancer/balancergroup_test.go b/xds/internal/balancer/edsbalancer/balancergroup_test.go
@@ -21,13 +21,13 @@ import (
 	"testing"
 	"time"
 
+	orcapb "github.com/cncf/udpa/go/udpa/data/orca/v1"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/roundrobin"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/xds/internal"
-	orcapb "google.golang.org/grpc/xds/internal/proto/udpa/data/orca/v1"
 )
 
 var (

diff --git a/xds/internal/balancer/orca/orca.go b/xds/internal/balancer/orca/orca.go
@@ -18,11 +18,11 @@
 package orca
 
 import (
+	orcapb "github.com/cncf/udpa/go/udpa/data/orca/v1"
 	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/internal/balancerload"
 	"google.golang.org/grpc/metadata"
-	orcapb "google.golang.org/grpc/xds/internal/proto/udpa/data/orca/v1"
 )
 
 const mdKey = "X-Endpoint-Load-Metrics-Bin"

diff --git a/xds/internal/balancer/orca/orca_test.go b/xds/internal/balancer/orca/orca_test.go
@@ -20,11 +20,11 @@ import (
 	"strings"
 	"testing"
 
+	orcapb "github.com/cncf/udpa/go/udpa/data/orca/v1"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/grpc/internal/grpctest"
 	"google.golang.org/grpc/metadata"
-	orcapb "google.golang.org/grpc/xds/internal/proto/udpa/data/orca/v1"
 )
 
 var (

diff --git a/xds/internal/proto/proto.go b/xds/internal/proto/proto.go
diff --git a/xds/internal/proto/regenerate.sh b/xds/internal/proto/regenerate.sh
diff --git a/xds/internal/proto/udpa/data/orca/v1/orca_load_report.pb.go b/xds/internal/proto/udpa/data/orca/v1/orca_load_report.pb.go