Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dfccd68

Browse files
murgatroid99murgatroid99
committed
Address review comments
1 parent 48ef1ed commit dfccd68

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,13 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
172172
name: resourceName,
173173
raw: raw});
174174
if (subscriptionEntry) {
175-
const watchers = subscriptionEntry.watchers;
176-
for (const watcher of watchers) {
175+
for (const watcher of subscriptionEntry.watchers) {
177176
watcher.onValidUpdate(resource);
178177
}
179178
clearTimeout(subscriptionEntry.resourceTimer);
180179
subscriptionEntry.cachedResponse = resource;
181180
if (subscriptionEntry.deletionIgnored) {
182-
experimental.log(logVerbosity.INFO, 'Received resource with previously ignored deletion: ' + resourceName);
181+
experimental.log(logVerbosity.INFO, `Received resource with previously ignored deletion: ${resourceName}`);
183182
subscriptionEntry.deletionIgnored = false;
184183
}
185184
}
@@ -191,8 +190,7 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
191190
error: `Validation failed for resource ${resourceName}`
192191
});
193192
if (subscriptionEntry) {
194-
const watchers = subscriptionEntry.watchers;
195-
for (const watcher of watchers) {
193+
for (const watcher of subscriptionEntry.watchers) {
196194
watcher.onTransientError({
197195
code: status.UNAVAILABLE,
198196
details: `Validation failed for resource ${resourceName}`,

‎packages/grpc-js-xds/test/test-nack.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('Validation errors', () => {
3838
xdsServer?.shutdownServer();
3939
});
4040
it('Should continue to use a valid resource after receiving an invalid EDS update', done => {
41-
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality:{region: 'region1'}}]);
41+
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality: {region: 'region1'}}]);
4242
const routeGroup = new FakeRouteGroup('route1', [{cluster: cluster}]);
4343
routeGroup.startAllBackends().then(() => {
4444
xdsServer.setEdsResource(cluster.getEndpointConfig());
@@ -49,7 +49,8 @@ describe('Validation errors', () => {
4949
client.startCalls(100);
5050
routeGroup.waitForAllBackendsToReceiveTraffic().then(() => {
5151
// After backends receive calls, set invalid EDS resource
52-
xdsServer.setEdsResource({cluster_name: cluster.getEndpointConfig().cluster_name, endpoints: [{}]});
52+
const invalidEdsResource = {cluster_name: cluster.getEndpointConfig().cluster_name, endpoints: [{}]};
53+
xdsServer.setEdsResource(invalidEdsResource);
5354
let seenNack = false;
5455
xdsServer.addResponseListener((typeUrl, responseState) => {
5556
if (responseState.state === 'NACKED') {
@@ -67,7 +68,7 @@ describe('Validation errors', () => {
6768
}, reason => done(reason));
6869
});
6970
it('Should continue to use a valid resource after receiving an invalid CDS update', done => {
70-
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality:{region: 'region1'}}]);
71+
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality: {region: 'region1'}}]);
7172
const routeGroup = new FakeRouteGroup('route1', [{cluster: cluster}]);
7273
routeGroup.startAllBackends().then(() => {
7374
xdsServer.setEdsResource(cluster.getEndpointConfig());
@@ -78,7 +79,8 @@ describe('Validation errors', () => {
7879
client.startCalls(100);
7980
routeGroup.waitForAllBackendsToReceiveTraffic().then(() => {
8081
// After backends receive calls, set invalid CDS resource
81-
xdsServer.setCdsResource({name: cluster.getClusterConfig().name});
82+
const invalidCdsResource = {name: cluster.getClusterConfig().name};
83+
xdsServer.setCdsResource(invalidCdsResource);
8284
let seenNack = false;
8385
xdsServer.addResponseListener((typeUrl, responseState) => {
8486
if (responseState.state === 'NACKED') {
@@ -96,7 +98,7 @@ describe('Validation errors', () => {
9698
}, reason => done(reason));
9799
});
98100
it('Should continue to use a valid resource after receiving an invalid RDS update', done => {
99-
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality:{region: 'region1'}}]);
101+
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality: {region: 'region1'}}]);
100102
const routeGroup = new FakeRouteGroup('route1', [{cluster: cluster}]);
101103
routeGroup.startAllBackends().then(() => {
102104
xdsServer.setEdsResource(cluster.getEndpointConfig());
@@ -107,7 +109,8 @@ describe('Validation errors', () => {
107109
client.startCalls(100);
108110
routeGroup.waitForAllBackendsToReceiveTraffic().then(() => {
109111
// After backends receive calls, set invalid RDS resource
110-
xdsServer.setRdsResource({name: routeGroup.getRouteConfiguration().name, virtual_hosts: [{domains: ['**']}]});
112+
const invalidRdsResource = {name: routeGroup.getRouteConfiguration().name, virtual_hosts: [{domains: ['**']}]};
113+
xdsServer.setRdsResource(invalidRdsResource);
111114
let seenNack = false;
112115
xdsServer.addResponseListener((typeUrl, responseState) => {
113116
if (responseState.state === 'NACKED') {
@@ -125,7 +128,7 @@ describe('Validation errors', () => {
125128
}, reason => done(reason));
126129
});
127130
it('Should continue to use a valid resource after receiving an invalid LDS update', done => {
128-
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality:{region: 'region1'}}]);
131+
const cluster = new FakeCluster('cluster1', [{backends: [new Backend()], locality: {region: 'region1'}}]);
129132
const routeGroup = new FakeRouteGroup('route1', [{cluster: cluster}]);
130133
routeGroup.startAllBackends().then(() => {
131134
xdsServer.setEdsResource(cluster.getEndpointConfig());
@@ -136,7 +139,8 @@ describe('Validation errors', () => {
136139
client.startCalls(100);
137140
routeGroup.waitForAllBackendsToReceiveTraffic().then(() => {
138141
// After backends receive calls, set invalid LDS resource
139-
xdsServer.setLdsResource({name: routeGroup.getListener().name});
142+
const invalidLdsResource = {name: routeGroup.getListener().name};
143+
xdsServer.setLdsResource(invalidLdsResource);
140144
let seenNack = false;
141145
xdsServer.addResponseListener((typeUrl, responseState) => {
142146
if (responseState.state === 'NACKED') {

0 commit comments

Comments
 (0)