Merge pull request #2021 from murgatroid99/grpc-js-xds_missing_files

grpc-js-xds: Add more missing files, add distrib test

Author: murgatroid99

packages/grpc-js-xds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js-xds",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",
   "main": "build/src/index.js",
   "scripts": {
@@ -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",

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

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');

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