Skip to content

Commit fc131d5

Browse files
committed
fix test after merge
Signed-off-by: radoslaw.chrzanowski <[email protected]>
1 parent 0292929 commit fc131d5

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

cache/src/main/java/io/envoyproxy/controlplane/cache/TestResources.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public static Cluster createCluster(String clusterName) {
7171
* @param clusterName name of the new cluster
7272
* @param address address to use for the cluster endpoint
7373
* @param port port to use for the cluster endpoint
74+
* @param discoveryType service discovery type
7475
*/
7576
public static Cluster createCluster(
7677
String clusterName, String address, int port, Cluster.DiscoveryType discoveryType) {

server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ public Watch createWatch(
10191019
watch.cancel();
10201020
} else {
10211021
Set<String> expectedKnown = expectedKnownResources.get(request.getTypeUrl());
1022-
if (expectedKnown != null && !expectedKnown.equals(knownResources)) {
1022+
if (expectedKnown != null && !expectedKnown.equals(knownResourceNames)) {
10231023
fail("unexpected known resources after sending all responses");
10241024
}
10251025
}

server/src/test/resources/envoy/ads.v3.delta.config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ node:
2121
static_resources:
2222
clusters:
2323
- connect_timeout: 1s
24+
type: STRICT_DNS
2425
load_assignment:
25-
cluster_name: ads_server
26+
cluster_name: ads_cluster
2627
endpoints:
2728
- lb_endpoints:
2829
- endpoint:
2930
address:
3031
socket_address:
31-
address: HOST_IP
32+
address: host.docker.internal
3233
port_value: HOST_PORT
3334
http2_protocol_options: {}
3435
name: ads_cluster

server/src/test/resources/envoy/xds.v3.delta.config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ node:
2525
static_resources:
2626
clusters:
2727
- connect_timeout: 1s
28+
type: STRICT_DNS
2829
load_assignment:
2930
cluster_name: xds_cluster
3031
endpoints:
3132
- lb_endpoints:
3233
- endpoint:
3334
address:
3435
socket_address:
35-
address: HOST_IP
36+
address: host.docker.internal
3637
port_value: HOST_PORT
3738
http2_protocol_options: {}
3839
name: xds_cluster

0 commit comments

Comments
 (0)