From 70b7917dda5ef6e971f10fb967b4ef0391be20d7 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Wed, 12 Jan 2022 10:30:27 -0800 Subject: [PATCH] grpc-js-xds: Add more missing files, add distrib test --- packages/grpc-js-xds/package.json | 1 + run-tests.sh | 2 ++ test/distrib/distrib-test.js | 22 +++++++++++++++++++++ test/distrib/run-distrib-test.sh | 33 +++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 test/distrib/distrib-test.js create mode 100644 test/distrib/run-distrib-test.sh diff --git a/packages/grpc-js-xds/package.json b/packages/grpc-js-xds/package.json index 8af0c103..ddc7f7bd 100644 --- a/packages/grpc-js-xds/package.json +++ b/packages/grpc-js-xds/package.json @@ -55,6 +55,7 @@ "files": [ "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", diff --git a/run-tests.sh b/run-tests.sh index e62cbd88..4bcb388b 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -75,6 +75,8 @@ do # npm test calls nyc gulp test npm test || FAILED="true" + + ./test/distrib/run-distrib-test.sh || FAILED="true" done set +ex diff --git a/test/distrib/distrib-test.js b/test/distrib/distrib-test.js new file mode 100644 index 00000000..de3cbc7c --- /dev/null +++ b/test/distrib/distrib-test.js @@ -0,0 +1,22 @@ +/* + * Copyright 2022 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +const grpcJs = require('@grpc/grpc-js'); + +const grpcJsXds = require('@grpc/grpc-js-xds'); + +const protoLoader = require('@grpc/proto-loader'); \ No newline at end of file diff --git a/test/distrib/run-distrib-test.sh b/test/distrib/run-distrib-test.sh new file mode 100644 index 00000000..e2ed0853 --- /dev/null +++ b/test/distrib/run-distrib-test.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright 2022 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -ex + +cd $(dirname $0) +base=$(pwd) + +cd ../../packages/grpc-js +npm pack +cd ../grpc-js-xds +npm pack +cd ../proto-loader +npm pack + +cd $base +npm install ../../packages/grpc-js/grpc-grpc-js-*.tgz +npm install ../../packages/grpc-js-xds/grpc-grpc-js-xds-*.tgz +npm install ../../packages/proto-loader/grpc-proto-loader-*.tgz + +node ./distrib-test.js