updating latest

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

Hide file tree

Showing 4 changed files with 60 additions and 60 deletions.
diff --git a/...ers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden b/...ers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden
@@ -108,17 +108,16 @@
                 }
               }
             },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
+            "l4": {
+              "cluster": {
+                "name": "local_app:tcp"
               },
               "statPrefix": "public_listener",
-              "staticRoute": true,
               "trafficPermissions": {}
             },
             "match": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp"
               ]
             }
           },
@@ -134,17 +133,16 @@
               }
             },
             "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
               "route": {
-                "name": "public_listener:http2"
+                "name": "public_listener:http"
               },
               "statPrefix": "public_listener",
               "staticRoute": true,
               "trafficPermissions": {}
             },
             "match": {
               "alpnProtocols": [
-                "consul~http2"
+                "consul~http"
               ]
             }
           },
@@ -160,17 +158,17 @@
               }
             },
             "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
+              "protocol": "L7_PROTOCOL_HTTP2",
               "route": {
-                "name": "public_listener:grpc"
+                "name": "public_listener:http2"
               },
               "statPrefix": "public_listener",
               "staticRoute": true,
               "trafficPermissions": {}
             },
             "match": {
               "alpnProtocols": [
-                "consul~grpc"
+                "consul~http2"
               ]
             }
           },
@@ -185,16 +183,18 @@
                 }
               }
             },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
+            "l7": {
+              "protocol": "L7_PROTOCOL_GRPC",
+              "route": {
+                "name": "public_listener:grpc"
               },
               "statPrefix": "public_listener",
+              "staticRoute": true,
               "trafficPermissions": {}
             },
             "match": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~grpc"
               ]
             }
           }

diff --git a/...al/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden b/...al/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden
@@ -113,12 +113,11 @@
               }
             }
           },
-          "l7": {
-            "route": {
-              "name": "public_listener:http"
+          "l4": {
+            "cluster": {
+              "name": "local_app:tcp"
             },
             "statPrefix": "public_listener",
-            "staticRoute": true,
             "trafficPermissions": {
               "allowPermissions": [
                 {
@@ -135,7 +134,7 @@
           },
           "match": {
             "alpnProtocols": [
-              "consul~http"
+              "consul~tcp"
             ]
           }
         },
@@ -151,9 +150,8 @@
             }
           },
           "l7": {
-            "protocol": "L7_PROTOCOL_HTTP2",
             "route": {
-              "name": "public_listener:http2"
+              "name": "public_listener:http"
             },
             "statPrefix": "public_listener",
             "staticRoute": true,
@@ -173,7 +171,7 @@
           },
           "match": {
             "alpnProtocols": [
-              "consul~http2"
+              "consul~http"
             ]
           }
         },
@@ -189,9 +187,9 @@
             }
           },
           "l7": {
-            "protocol": "L7_PROTOCOL_GRPC",
+            "protocol": "L7_PROTOCOL_HTTP2",
             "route": {
-              "name": "public_listener:grpc"
+              "name": "public_listener:http2"
             },
             "statPrefix": "public_listener",
             "staticRoute": true,
@@ -211,7 +209,7 @@
           },
           "match": {
             "alpnProtocols": [
-              "consul~grpc"
+              "consul~http2"
             ]
           }
         },
@@ -226,11 +224,13 @@
               }
             }
           },
-          "l4": {
-            "cluster": {
-              "name": "local_app:tcp"
+          "l7": {
+            "protocol": "L7_PROTOCOL_GRPC",
+            "route": {
+              "name": "public_listener:grpc"
             },
             "statPrefix": "public_listener",
+            "staticRoute": true,
             "trafficPermissions": {
               "allowPermissions": [
                 {
@@ -247,7 +247,7 @@
           },
           "match": {
             "alpnProtocols": [
-              "consul~tcp"
+              "consul~grpc"
             ]
           }
         }

diff --git a/...internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden b/...internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden
@@ -113,17 +113,16 @@
               }
             }
           },
-          "l7": {
-            "route": {
-              "name": "public_listener:http"
+          "l4": {
+            "cluster": {
+              "name": "local_app:tcp"
             },
             "statPrefix": "public_listener",
-            "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~http"
+              "consul~tcp"
             ]
           }
         },
@@ -139,17 +138,16 @@
             }
           },
           "l7": {
-            "protocol": "L7_PROTOCOL_HTTP2",
             "route": {
-              "name": "public_listener:http2"
+              "name": "public_listener:http"
             },
             "statPrefix": "public_listener",
             "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~http2"
+              "consul~http"
             ]
           }
         },
@@ -165,17 +163,17 @@
             }
           },
           "l7": {
-            "protocol": "L7_PROTOCOL_GRPC",
+            "protocol": "L7_PROTOCOL_HTTP2",
             "route": {
-              "name": "public_listener:grpc"
+              "name": "public_listener:http2"
             },
             "statPrefix": "public_listener",
             "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~grpc"
+              "consul~http2"
             ]
           }
         },
@@ -190,16 +188,18 @@
               }
             }
           },
-          "l4": {
-            "cluster": {
-              "name": "local_app:tcp"
+          "l7": {
+            "protocol": "L7_PROTOCOL_GRPC",
+            "route": {
+              "name": "public_listener:grpc"
             },
             "statPrefix": "public_listener",
+            "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~tcp"
+              "consul~grpc"
             ]
           }
         }

diff --git a/...esh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden b/...esh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden
@@ -113,16 +113,18 @@
               }
             }
           },
-          "l4": {
-            "cluster": {
-              "name": "local_app:tcp"
+          "l7": {
+            "protocol": "L7_PROTOCOL_GRPC",
+            "route": {
+              "name": "public_listener:grpc"
             },
             "statPrefix": "public_listener",
+            "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~tcp"
+              "consul~grpc"
             ]
           }
         },
@@ -137,17 +139,16 @@
               }
             }
           },
-          "l7": {
-            "route": {
-              "name": "public_listener:http"
+          "l4": {
+            "cluster": {
+              "name": "local_app:tcp"
             },
             "statPrefix": "public_listener",
-            "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~http"
+              "consul~tcp"
             ]
           }
         },
@@ -163,17 +164,16 @@
             }
           },
           "l7": {
-            "protocol": "L7_PROTOCOL_HTTP2",
             "route": {
-              "name": "public_listener:http2"
+              "name": "public_listener:http"
             },
             "statPrefix": "public_listener",
             "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~http2"
+              "consul~http"
             ]
           }
         },
@@ -189,17 +189,17 @@
             }
           },
           "l7": {
-            "protocol": "L7_PROTOCOL_GRPC",
+            "protocol": "L7_PROTOCOL_HTTP2",
             "route": {
-              "name": "public_listener:grpc"
+              "name": "public_listener:http2"
             },
             "statPrefix": "public_listener",
             "staticRoute": true,
             "trafficPermissions": {}
           },
           "match": {
             "alpnProtocols": [
-              "consul~grpc"
+              "consul~http2"
             ]
           }
         }