Merge branch 'master' into grpc-js_compression_support

Author: murgatroid99

.gitmodules

@@ -10,12 +10,12 @@
 [submodule "packages/grpc-js-xds/deps/envoy-api"]
 	path = packages/grpc-js-xds/deps/envoy-api
 	url = https://github.com/envoyproxy/data-plane-api.git
-[submodule "packages/grpc-js-xds/deps/udpa"]
-	path = packages/grpc-js-xds/deps/udpa
-	url = https://github.com/cncf/udpa.git
 [submodule "packages/grpc-js-xds/deps/googleapis"]
 	path = packages/grpc-js-xds/deps/googleapis
 	url = https://github.com/googleapis/googleapis.git
 [submodule "packages/grpc-js-xds/deps/protoc-gen-validate"]
 	path = packages/grpc-js-xds/deps/protoc-gen-validate
 	url = https://github.com/envoyproxy/protoc-gen-validate.git
+[submodule "packages/grpc-js-xds/deps/xds"]
+	path = packages/grpc-js-xds/deps/xds
+	url = https://github.com/cncf/xds.git

packages/grpc-js-xds/deps/udpa

@@ -12,7 +12,7 @@
     "prepare": "npm run compile",
     "pretest": "npm run compile",
     "posttest": "npm run check",
-    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs deps/envoy-api/ deps/udpa/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib @grpc/grpc-js envoy/service/discovery/v2/ads.proto envoy/service/load_stats/v2/lrs.proto envoy/service/discovery/v3/ads.proto envoy/service/load_stats/v3/lrs.proto envoy/config/listener/v3/listener.proto envoy/config/route/v3/route.proto envoy/config/cluster/v3/cluster.proto envoy/config/endpoint/v3/endpoint.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto udpa/type/v1/typed_struct.proto envoy/extensions/filters/http/fault/v3/fault.proto",
+    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs deps/envoy-api/ deps/xds/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib @grpc/grpc-js envoy/service/discovery/v2/ads.proto envoy/service/load_stats/v2/lrs.proto envoy/service/discovery/v3/ads.proto envoy/service/load_stats/v3/lrs.proto envoy/config/listener/v3/listener.proto envoy/config/route/v3/route.proto envoy/config/cluster/v3/cluster.proto envoy/config/endpoint/v3/endpoint.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto udpa/type/v1/typed_struct.proto xds/type/v3/typed_struct.proto envoy/extensions/filters/http/fault/v3/fault.proto",
     "generate-interop-types": "proto-loader-gen-types --keep-case --longs String --enums String --defaults --oneofs --json --includeComments --includeDirs proto/ -O interop/generated --grpcLib @grpc/grpc-js grpc/testing/test.proto"
   },
   "repository": {
@@ -63,7 +63,11 @@
     "deps/googleapis/google/api/**/*.proto",
     "deps/googleapis/google/protobuf/**/*.proto",
     "deps/googleapis/google/rpc/**/*.proto",
-    "deps/udpa/udpa/annotations/**/*.proto",
+    "deps/xds/udpa/annotations/**/*.proto",
+    "deps/xds/udpa/type/**/*.proto",
+    "deps/xds/xds/annotations/**/*.proto",
+    "deps/xds/xds/core/**/*.proto",
+    "deps/xds/xds/type/**/*.proto",
     "deps/protoc-gen-validate/validate/**/*.proto"
   ]
 }