Skip to content

Commit 692ee3c

Browse files
committed
grpc-js-xds: Switch from udpa to xds submodule
1 parent 5a49a93 commit 692ee3c

35 files changed

+263
-28
lines changed

.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
[submodule "packages/grpc-js-xds/deps/envoy-api"]
1111
path = packages/grpc-js-xds/deps/envoy-api
1212
url = https://github.com/envoyproxy/data-plane-api.git
13-
[submodule "packages/grpc-js-xds/deps/udpa"]
14-
path = packages/grpc-js-xds/deps/udpa
15-
url = https://github.com/cncf/udpa.git
1613
[submodule "packages/grpc-js-xds/deps/googleapis"]
1714
path = packages/grpc-js-xds/deps/googleapis
1815
url = https://github.com/googleapis/googleapis.git
1916
[submodule "packages/grpc-js-xds/deps/protoc-gen-validate"]
2017
path = packages/grpc-js-xds/deps/protoc-gen-validate
2118
url = https://github.com/envoyproxy/protoc-gen-validate.git
19+
[submodule "packages/grpc-js-xds/deps/xds"]
20+
path = packages/grpc-js-xds/deps/xds
21+
url = https://github.com/cncf/xds.git

packages/grpc-js-xds/deps/udpa

-1
This file was deleted.

packages/grpc-js-xds/deps/xds

Submodule xds added at cb28da3

packages/grpc-js-xds/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"prepare": "npm run compile",
1313
"pretest": "npm run compile",
1414
"posttest": "npm run check",
15-
"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",
15+
"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",
1616
"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"
1717
},
1818
"repository": {

packages/grpc-js-xds/src/generated/cluster.ts

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/fault.ts

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/google/protobuf/FieldOptions.ts

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/google/protobuf/FileOptions.ts

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/google/protobuf/MessageOptions.ts

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/http_connection_manager.ts

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/listener.ts

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/route.ts

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/typed_struct.ts

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/FieldMigrateAnnotation.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/FieldSecurityAnnotation.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/FileMigrateAnnotation.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/MigrateAnnotation.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/PackageVersionStatus.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/StatusAnnotation.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/annotations/VersioningAnnotation.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/udpa/type/v1/TypedStruct.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/annotations/v3/FieldStatusAnnotation.ts

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/annotations/v3/FileStatusAnnotation.ts

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/annotations/v3/MessageStatusAnnotation.ts

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/annotations/v3/PackageVersionStatus.ts

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/annotations/v3/StatusAnnotation.ts

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/core/v3/Authority.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/core/v3/CollectionEntry.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/core/v3/ContextParams.ts

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/grpc-js-xds/src/generated/xds/core/v3/ResourceLocator.ts

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)