Skip to content

Commit aec0c9b

Browse files
authored
Merge pull request #2837 from murgatroid99/grpc-js-xds_server_creds
grpc-js-xds: Implement `XdsServerCredentials`
2 parents 6732205 + 1a1024a commit aec0c9b

File tree

82 files changed

+3601
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+3601
-130
lines changed

packages/grpc-js-xds/deps/envoy-api

Submodule envoy-api updated 108 files

packages/grpc-js-xds/gulpfile.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ import * as mocha from 'gulp-mocha';
2121
import * as path from 'path';
2222
import * as execa from 'execa';
2323
import * as semver from 'semver';
24+
import { ncp } from 'ncp';
25+
import { promisify } from 'util';
26+
27+
const ncpP = promisify(ncp);
2428

2529
Error.stackTraceLimit = Infinity;
2630

@@ -60,6 +64,10 @@ const cleanAll = gulp.parallel(clean);
6064
*/
6165
const compile = checkTask(() => execNpmCommand('compile'));
6266

67+
const copyTestFixtures = checkTask(() =>
68+
ncpP(`${jsCoreDir}/test/fixtures`, `${outDir}/test/fixtures`)
69+
);
70+
6371
const runTests = checkTask(() => {
6472
process.env.GRPC_EXPERIMENTAL_XDS_FEDERATION = 'true';
6573
process.env.GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG = 'true';
@@ -71,7 +79,7 @@ const runTests = checkTask(() => {
7179
require: ['ts-node/register']}));
7280
});
7381

74-
const test = gulp.series(install, runTests);
82+
const test = gulp.series(install, copyTestFixtures, runTests);
7583

7684
export {
7785
install,

packages/grpc-js-xds/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"prepare": "npm run generate-types && 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/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 envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto envoy/extensions/clusters/aggregate/v3/cluster.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/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 envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto envoy/extensions/clusters/aggregate/v3/cluster.proto envoy/extensions/transport_sockets/tls/v3/tls.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
"generate-test-types": "proto-loader-gen-types --keep-case --longs String --enums String --defaults --oneofs --json --includeComments --includeDirs proto/ -O test/generated --grpcLib @grpc/grpc-js grpc/testing/echo.proto"
1818
},
@@ -41,6 +41,7 @@
4141
"@types/yargs": "^15.0.5",
4242
"find-free-ports": "^3.1.1",
4343
"gts": "^5.0.1",
44+
"ncp": "^2.0.0",
4445
"typescript": "^5.1.3",
4546
"yargs": "^15.4.1"
4647
},

packages/grpc-js-xds/src/generated/ads.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/cluster.ts

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

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

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

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

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

packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/Cluster.ts

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

packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/OutlierDetection.ts

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

0 commit comments

Comments
 (0)