fix test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
envoyproxy · Nov 14, 2023 · c3f433d · c3f433d
1 parent f88929c
commit c3f433d
Show file tree

Hide file tree

Showing 56 changed files with 98 additions and 98 deletions.
diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go
@@ -123,7 +123,7 @@ func buildXdsClusterLoadAssignment(clusterName string, destSettings []*ir.Destin
 		// We use the name of the backendRef as a pseudo region name.
 		locality := &endpointv3.LocalityLbEndpoints{
 			Locality: &corev3.Locality{
-				Region: fmt.Sprintf("%s/setting/%d", clusterName, i),
+				Region: fmt.Sprintf("%s/backend/%d", clusterName, i),
 			},
 			LbEndpoints: endpoints,
 			Priority:    0,

diff --git a/...l/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.endpoints.yaml b/...l/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.endpoints.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml
@@ -30,7 +30,7 @@
         loadBalancingWeight: 1
       loadBalancingWeight: 1
       locality:
-        region: accesslog|otel-collector.default.svc.cluster.local|4317/setting/0
+        region: accesslog|otel-collector.default.svc.cluster.local|4317/backend/0
   name: accesslog|otel-collector.default.svc.cluster.local|4317
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: direct-route-dest/setting/0
+      region: direct-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: direct-route-dest/setting/0
+      region: direct-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: route-dest/setting/0
+      region: route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.endpoints.yaml
@@ -9,7 +9,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
 - clusterName: second-route-dest
   endpoints:
   - lbEndpoints:
@@ -21,7 +21,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: second-route-dest/setting/0
+      region: second-route-dest/backend/0
 - clusterName: third-route-dest
   endpoints:
   - lbEndpoints:
@@ -33,7 +33,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: third-route-dest/setting/0
+      region: third-route-dest/backend/0
 - clusterName: fourth-route-dest
   endpoints:
   - lbEndpoints:
@@ -45,7 +45,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: fourth-route-dest/setting/0
+      region: fourth-route-dest/backend/0
 - clusterName: fifth-route-dest
   endpoints:
   - lbEndpoints:
@@ -57,7 +57,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: fifth-route-dest/setting/0
+      region: fifth-route-dest/backend/0
 - clusterName: sixth-route-dest
   endpoints:
   - lbEndpoints:
@@ -69,7 +69,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: sixth-route-dest/setting/0
+      region: sixth-route-dest/backend/0
 - clusterName: seventh-route-dest
   endpoints:
   - lbEndpoints:
@@ -81,4 +81,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: seventh-route-dest/setting/0
+      region: seventh-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.endpoints.yaml
@@ -9,7 +9,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: route-dest/setting/0
+      region: route-dest/backend/0
 - clusterName: mirror-route-dest
   endpoints:
   - lbEndpoints:
@@ -21,7 +21,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: mirror-route-dest/setting/0
+      region: mirror-route-dest/backend/0
 - clusterName: mirror-route-dest1
   endpoints:
   - lbEndpoints:
@@ -33,4 +33,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: mirror-route-dest1/setting/0
+      region: mirror-route-dest1/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: redirect-route-dest/setting/0
+      region: redirect-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: regex-route-dest/setting/0
+      region: regex-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: request-header-route-dest/setting/0
+      region: request-header-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: response-header-route-dest/setting/0
+      region: response-header-route-dest/backend/0
diff --git a/.../xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.endpoints.yaml b/.../xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: response-header-route-dest/setting/0
+      region: response-header-route-dest/backend/0
diff --git a/...rnal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.endpoints.yaml b/...rnal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: response-header-route-dest/setting/0
+      region: response-header-route-dest/backend/0
diff --git a/...xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.endpoints.yaml b/...xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: rewrite-route-dest/setting/0
+      region: rewrite-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: rewrite-route/setting/0
+      region: rewrite-route/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: rewrite-route-dest/setting/0
+      region: rewrite-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: rewrite-route-dest/setting/0
+      region: rewrite-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.endpoints.yaml
@@ -9,7 +9,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 20
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
   - lbEndpoints:
     - endpoint:
         address:
@@ -19,7 +19,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 40
     locality:
-      region: first-route-dest/setting/1
+      region: first-route-dest/backend/1
   - lbEndpoints:
     - endpoint:
         address:
@@ -29,7 +29,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 20
     locality:
-      region: first-route-dest/setting/2
+      region: first-route-dest/backend/2
   - lbEndpoints:
     - endpoint:
         address:
@@ -39,4 +39,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 20
     locality:
-      region: first-route-dest/setting/3
+      region: first-route-dest/backend/3
diff --git a/...nal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.endpoints.yaml b/...nal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 50
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml
@@ -44,7 +44,7 @@
         loadBalancingWeight: 1
       loadBalancingWeight: 1
       locality:
-        region: localhost_443/setting/0
+        region: localhost_443/backend/0
   name: localhost_443
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.endpoints.yaml
@@ -9,7 +9,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-www.test.com-dest/setting/0
+      region: first-route-www.test.com-dest/backend/0
 - clusterName: second-route-www.test.com-dest
   endpoints:
   - lbEndpoints:
@@ -21,7 +21,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: second-route-www.test.com-dest/setting/0
+      region: second-route-www.test.com-dest/backend/0
 - clusterName: "192_168_1_250_8080"
   endpoints:
   - lbEndpoints:
@@ -33,4 +33,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: 192_168_1_250_8080/setting/0
+      region: 192_168_1_250_8080/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml
@@ -44,7 +44,7 @@
         loadBalancingWeight: 1
       loadBalancingWeight: 1
       locality:
-        region: localhost_443/setting/0
+        region: localhost_443/backend/0
   name: localhost_443
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.endpoints.yaml
@@ -9,7 +9,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
 - clusterName: second-route-dest
   endpoints:
   - lbEndpoints:
@@ -21,4 +21,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: second-route-dest/setting/0
+      region: second-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml
@@ -58,7 +58,7 @@
         loadBalancingWeight: 1
       loadBalancingWeight: 1
       locality:
-        region: ratelimit_cluster/setting/0
+        region: ratelimit_cluster/backend/0
   name: ratelimit_cluster
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.endpoints.yaml
@@ -9,7 +9,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0
 - clusterName: second-route-dest
   endpoints:
   - lbEndpoints:
@@ -21,7 +21,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: second-route-dest/setting/0
+      region: second-route-dest/backend/0
 - clusterName: third-route-dest
   endpoints:
   - lbEndpoints:
@@ -33,7 +33,7 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: third-route-dest/setting/0
+      region: third-route-dest/backend/0
 - clusterName: "192_168_1_250_443"
   endpoints:
   - lbEndpoints:
@@ -45,4 +45,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: 192_168_1_250_443/setting/0
+      region: 192_168_1_250_443/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml
@@ -30,7 +30,7 @@
         loadBalancingWeight: 1
       loadBalancingWeight: 1
       locality:
-        region: localhost_443/setting/0
+        region: localhost_443/backend/0
   name: localhost_443
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.endpoints.yaml
@@ -9,4 +9,4 @@
       loadBalancingWeight: 1
     loadBalancingWeight: 1
     locality:
-      region: first-route-dest/setting/0
+      region: first-route-dest/backend/0