Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grpc-js-xds: Drop xDS v2 support #2244

Merged
merged 2 commits into from Oct 14, 2022
Merged

grpc-js-xds: Drop xDS v2 support #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3003dbe
grpc-js-xds: Delete generated code for xDS v2
murgatroid99 Oct 12, 2022
4ac8d6d
grpc-js-xds: Remove all code for handling xDS v2
murgatroid99 Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/grpc-js-xds/package.json
View file
Open in desktop
Expand Up @@ -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/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 envoy/service/status/v3/csds.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/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 envoy/service/status/v3/csds.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": {
Expand Down Expand Up @@ -56,7 +56,6 @@
"src/**/*.ts",
"build/src/**/*.{js,d.ts,js.map}",
"deps/envoy-api/envoy/admin/v3/**/*.proto",
"deps/envoy-api/envoy/api/v2/**/*.proto",
"deps/envoy-api/envoy/config/**/*.proto",
"deps/envoy-api/envoy/service/**/*.proto",
"deps/envoy-api/envoy/type/**/*.proto",
Expand Down
14 changes: 5 additions & 9 deletions packages/grpc-js-xds/src/csds.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import { ClientStatusDiscoveryServiceHandlers } from "./generated/envoy/service/
import { ClientStatusRequest__Output } from "./generated/envoy/service/status/v3/ClientStatusRequest";
import { ClientStatusResponse } from "./generated/envoy/service/status/v3/ClientStatusResponse";
import { Timestamp } from "./generated/google/protobuf/Timestamp";
import { AdsTypeUrl, CDS_TYPE_URL_V2, CDS_TYPE_URL_V3, EDS_TYPE_URL_V2, EDS_TYPE_URL_V3, LDS_TYPE_URL_V2, LDS_TYPE_URL_V3, RDS_TYPE_URL_V2, RDS_TYPE_URL_V3 } from "./resources";
import { AdsTypeUrl, CDS_TYPE_URL, EDS_TYPE_URL, LDS_TYPE_URL, RDS_TYPE_URL } from "./resources";
import { HandleResponseResult } from "./xds-stream-state/xds-stream-state";
import { sendUnaryData, ServerDuplexStream, ServerUnaryCall, status, experimental, loadPackageDefinition, logVerbosity } from '@grpc/grpc-js';
import { loadSync } from "@grpc/proto-loader";
Expand Down Expand Up @@ -50,14 +50,10 @@ function dateToProtoTimestamp(date?: Date | null): Timestamp | null {
let clientNode: Node | null = null;

const configStatus = {
[EDS_TYPE_URL_V2]: new Map<string, GenericXdsConfig>(),
[EDS_TYPE_URL_V3]: new Map<string, GenericXdsConfig>(),
[CDS_TYPE_URL_V2]: new Map<string, GenericXdsConfig>(),
[CDS_TYPE_URL_V3]: new Map<string, GenericXdsConfig>(),
[RDS_TYPE_URL_V2]: new Map<string, GenericXdsConfig>(),
[RDS_TYPE_URL_V3]: new Map<string, GenericXdsConfig>(),
[LDS_TYPE_URL_V2]: new Map<string, GenericXdsConfig>(),
[LDS_TYPE_URL_V3]: new Map<string, GenericXdsConfig>()
[EDS_TYPE_URL]: new Map<string, GenericXdsConfig>(),
[CDS_TYPE_URL]: new Map<string, GenericXdsConfig>(),
[RDS_TYPE_URL]: new Map<string, GenericXdsConfig>(),
[LDS_TYPE_URL]: new Map<string, GenericXdsConfig>()
};

/**
Expand Down
57 changes: 0 additions & 57 deletions packages/grpc-js-xds/src/generated/ads.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

202 changes: 0 additions & 202 deletions packages/grpc-js-xds/src/generated/envoy/api/v2/DeltaDiscoveryRequest.ts
View file
Open in desktop

This file was deleted.