fix xds tests

hashicorp · Nov 2, 2023 · c0bf7fb · c0bf7fb
1 parent bbf93ff
commit c0bf7fb
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 125 deletions.
diff --git a/...der/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/...der/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -1,8 +1,8 @@
 {
   "proxyState": {
     "clusters": {
-      "tcp2.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app.default.dc1.internal.foo.consul",
+      "http.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -11,7 +11,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -26,11 +26,11 @@
             }
           }
         },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
+        "name": "http.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
       },
-      "tcp2.api-app2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app2.default.dc1.internal.foo.consul",
+      "http.api-app2.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app2.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -39,7 +39,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -54,11 +54,22 @@
             }
           }
         },
-        "name": "tcp2.api-app2.default.dc1.internal.foo.consul",
+        "name": "http.api-app2.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
+      },
+      "original-destination": {
+        "endpointGroup": {
+          "passthrough": {
+            "config": {
+              "connectTimeout": "5s"
+            }
+          }
+        },
+        "name": "original-destination",
         "protocol": "PROTOCOL_TCP"
       },
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
+      "tcp.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -67,7 +78,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -82,11 +93,11 @@
             }
           }
         },
-        "name": "http.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
+        "name": "tcp.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_TCP"
       },
-      "http.api-app2.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app2.default.dc1.internal.foo.consul",
+      "tcp.api-app2.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp.api-app2.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -95,7 +106,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -110,22 +121,11 @@
             }
           }
         },
-        "name": "http.api-app2.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
+        "name": "tcp.api-app2.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
+      "tcp2.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp2.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -134,7 +134,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -149,11 +149,11 @@
             }
           }
         },
-        "name": "tcp.api-app.default.dc1.internal.foo.consul",
+        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp.api-app2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app2.default.dc1.internal.foo.consul",
+      "tcp2.api-app2.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp2.api-app2.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -162,7 +162,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -177,7 +177,7 @@
             }
           }
         },
-        "name": "tcp.api-app2.default.dc1.internal.foo.consul",
+        "name": "tcp2.api-app2.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       }
     },
@@ -383,7 +383,7 @@
     }
   },
   "requiredEndpoints": {
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
+    "http.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -399,7 +399,7 @@
       },
       "port": "mesh"
     },
-    "tcp2.api-app2.default.dc1.internal.foo.consul": {
+    "http.api-app2.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app2",
         "tenancy": {
@@ -415,7 +415,7 @@
       },
       "port": "mesh"
     },
-    "http.api-app.default.dc1.internal.foo.consul": {
+    "tcp.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -431,7 +431,7 @@
       },
       "port": "mesh"
     },
-    "http.api-app2.default.dc1.internal.foo.consul": {
+    "tcp.api-app2.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app2",
         "tenancy": {
@@ -447,7 +447,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
+    "tcp2.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -463,7 +463,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app2.default.dc1.internal.foo.consul": {
+    "tcp2.api-app2.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app2",
         "tenancy": {

diff --git a/...uilder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/...uilder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -1,8 +1,8 @@
 {
   "proxyState": {
     "clusters": {
-      "tcp2.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app.default.dc1.internal.foo.consul",
+      "http.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -11,7 +11,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -26,11 +26,22 @@
             }
           }
         },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
+        "name": "http.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
+      },
+      "original-destination": {
+        "endpointGroup": {
+          "passthrough": {
+            "config": {
+              "connectTimeout": "5s"
+            }
+          }
+        },
+        "name": "original-destination",
         "protocol": "PROTOCOL_TCP"
       },
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
+      "tcp.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -39,7 +50,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -54,22 +65,11 @@
             }
           }
         },
-        "name": "http.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
+        "name": "tcp.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
+      "tcp2.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp2.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -78,7 +78,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -93,7 +93,7 @@
             }
           }
         },
-        "name": "tcp.api-app.default.dc1.internal.foo.consul",
+        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       }
     },
@@ -212,7 +212,7 @@
     }
   },
   "requiredEndpoints": {
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
+    "http.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -228,7 +228,7 @@
       },
       "port": "mesh"
     },
-    "http.api-app.default.dc1.internal.foo.consul": {
+    "tcp.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -244,7 +244,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
+    "tcp2.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {