fixing test after route fix merged into main

hashicorp · Oct 24, 2023 · e7ff94b · e7ff94b
1 parent b5fa4f2
commit e7ff94b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden
@@ -238,6 +238,7 @@
     "default/local/default/api-1:http:1.1.1.1:1234": {
       "virtualHosts": [
         {
+          "domains": ["*"],
           "name": "default/local/default/api-1:http:1.1.1.1:1234",
           "routeRules": [
             {

diff --git a/...xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/...xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -247,7 +247,7 @@
         {
           "l7": {
             "route": {
-              "name": "default/local/default/api-app"
+              "name": "default/local/default/api-app:http"
             },
             "statPrefix": "upstream."
           },
@@ -264,7 +264,7 @@
         {
           "l7": {
             "route": {
-              "name": "default/local/default/api-app2"
+              "name": "default/local/default/api-app2:http"
             },
             "statPrefix": "upstream."
           },
@@ -324,10 +324,11 @@
     }
   ],
   "routes": {
-    "default/local/default/api-app": {
+    "default/local/default/api-app:http": {
       "virtualHosts": [
         {
-          "name": "default/local/default/api-app",
+          "domains": ["*"],
+          "name": "default/local/default/api-app:http",
           "routeRules": [
             {
               "destination": {
@@ -345,10 +346,11 @@
         }
       ]
     },
-    "default/local/default/api-app2": {
+    "default/local/default/api-app2:http": {
       "virtualHosts": [
         {
-          "name": "default/local/default/api-app2",
+          "domains": ["*"],
+          "name": "default/local/default/api-app2:http",
           "routeRules": [
             {
               "destination": {

diff --git a/...rs/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/...rs/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -145,7 +145,7 @@
         {
           "l7": {
             "route": {
-              "name": "default/local/default/api-app"
+              "name": "default/local/default/api-app:http"
             },
             "statPrefix": "upstream."
           },
@@ -180,10 +180,11 @@
     }
   ],
   "routes": {
-    "default/local/default/api-app": {
+    "default/local/default/api-app:http": {
       "virtualHosts": [
         {
-          "name": "default/local/default/api-app",
+          "domains": ["*"],
+          "name": "default/local/default/api-app:http",
           "routeRules": [
             {
               "destination": {

diff --git a/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -145,7 +145,7 @@
         {
           "l7": {
             "route": {
-              "name": "default/local/default/api-app"
+              "name": "default/local/default/api-app:http"
             },
             "statPrefix": "upstream."
           },
@@ -180,10 +180,11 @@
     }
   ],
   "routes": {
-    "default/local/default/api-app": {
+    "default/local/default/api-app:http": {
       "virtualHosts": [
         {
-          "name": "default/local/default/api-app",
+          "domains": ["*"],
+          "name": "default/local/default/api-app:http",
           "routeRules": [
             {
               "destination": {