From 157882da451b8be623cc50a139c75b4031c9dab4 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 27 Sep 2021 15:45:22 -0700
Subject: [PATCH] grpc-js-xds: A few fixes for xDS tests

---
 packages/grpc-js-xds/scripts/xds.sh       |  2 +-
 packages/grpc-js-xds/src/xds-bootstrap.ts |  2 +-
 packages/grpc-js-xds/src/xds-client.ts    | 13 +++++++++++--
 packages/grpc-js/src/server.ts            |  2 ++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/grpc-js-xds/scripts/xds.sh b/packages/grpc-js-xds/scripts/xds.sh
index 131cbd55..a06cde84 100755
--- a/packages/grpc-js-xds/scripts/xds.sh
+++ b/packages/grpc-js-xds/scripts/xds.sh
@@ -59,7 +59,7 @@ GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weigh
     --gcp_suffix=$(date '+%s') \
     --verbose \
     ${XDS_V3_OPT-} \
-    --client_cmd="$(which node) grpc-node/packages/grpc-js-xds/build/interop/xds-interop-client \
+    --client_cmd="$(which node) --enable-source-maps grpc-node/packages/grpc-js-xds/build/interop/xds-interop-client \
       --server=xds:///{server_uri} \
       --stats_port={stats_port} \
       --qps={qps} \
diff --git a/packages/grpc-js-xds/src/xds-bootstrap.ts b/packages/grpc-js-xds/src/xds-bootstrap.ts
index 64a7bcb9..876b6d95 100644
--- a/packages/grpc-js-xds/src/xds-bootstrap.ts
+++ b/packages/grpc-js-xds/src/xds-bootstrap.ts
@@ -109,7 +109,7 @@ function validateXdsServerConfig(obj: any): XdsServerConfig {
   return {
     serverUri: obj.server_uri,
     channelCreds: obj.channel_creds.map(validateChannelCredsConfig),
-    serverFeatures: obj.server_features
+    serverFeatures: obj.server_features ?? []
   };
 }
 
diff --git a/packages/grpc-js-xds/src/xds-client.ts b/packages/grpc-js-xds/src/xds-client.ts
index 41bc2714..cfb8b66a 100644
--- a/packages/grpc-js-xds/src/xds-client.ts
+++ b/packages/grpc-js-xds/src/xds-client.ts
@@ -341,6 +341,16 @@ export class XdsClient {
           return;
         }
         trace('Loaded bootstrap info: ' + JSON.stringify(bootstrapInfo, undefined, 2));
+        if (bootstrapInfo.xdsServers.length < 1) {
+          trace('Failed to initialize xDS Client. No servers provided in bootstrap info.');
+          // Bubble this error up to any listeners
+          this.reportStreamError({
+            code: status.INTERNAL,
+            details: 'Failed to initialize xDS Client. No servers provided in bootstrap info.',
+            metadata: new Metadata(),
+          });
+          return;
+        }
         if (bootstrapInfo.xdsServers[0].serverFeatures.indexOf('xds_v3') >= 0) {
           this.apiVersion = XdsApiVersion.V3;
         } else {
@@ -425,8 +435,7 @@ export class XdsClient {
           {channelOverride: channel}
         );
         this.maybeStartLrsStream();
-      },
-      (error) => {
+      }).catch((error) => {
         trace('Failed to initialize xDS Client. ' + error.message);
         // Bubble this error up to any listeners
         this.reportStreamError({
diff --git a/packages/grpc-js/src/server.ts b/packages/grpc-js/src/server.ts
index 42b79a3c..ed4b397d 100644
--- a/packages/grpc-js/src/server.ts
+++ b/packages/grpc-js/src/server.ts
@@ -309,6 +309,7 @@ export class Server {
           const http2Server = setupServer();
           return new Promise<number | Error>((resolve, reject) => {
             function onError(err: Error): void {
+              trace('Failed to bind ' + subchannelAddressToString(address) + ' with error ' + err.message);
               resolve(err);
             }
 
@@ -356,6 +357,7 @@ export class Server {
       const http2Server = setupServer();
       return new Promise<BindResult>((resolve, reject) => {
         function onError(err: Error): void {
+          trace('Failed to bind ' + subchannelAddressToString(address) + ' with error ' + err.message);
           resolve(bindWildcardPort(addressList.slice(1)));
         }