fix test golden files.

hashicorp · Dec 15, 2023 · b1e93af · b1e93af
1 parent 0aeb96a
commit b1e93af
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 24 deletions.
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden
@@ -38,7 +38,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side"
                   }
                 }
               ],
@@ -140,7 +140,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1"
                   }
                 }
               ],
@@ -191,7 +191,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2"
                   }
                 }
               ],
@@ -242,7 +242,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact"
                   }
                 }
               ],
@@ -346,7 +346,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side"
                   }
                 }
               ],
@@ -1539,7 +1539,8 @@
               }
             ],
             "tlsParams": {},
-            "matchTypedSubjectAltNames": [
+            "validationContext": {
+              "matchTypedSubjectAltNames": [
                 {
                   "sanType": "URI",
                   "matcher": {

diff --git a/...onnect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/...onnect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/...clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...nnect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/...nnect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...lusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/...lusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...sters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/...sters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
@@ -106,7 +106,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...stdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden b/...stdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -106,7 +106,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...ters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/...ters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
@@ -106,7 +106,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...tdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden b/...tdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -106,7 +106,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden
@@ -89,7 +89,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...ters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/...ters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
@@ -108,7 +108,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...tdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/...tdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
@@ -108,7 +108,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...ers/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/...ers/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
@@ -108,7 +108,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...data/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/...data/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
@@ -108,7 +108,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...ta/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/...ta/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/...xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...a/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/...a/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/...ds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/...ds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -107,7 +107,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],

diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden
@@ -167,7 +167,7 @@
                 {
                   "sanType": "URI",
                   "matcher": {
-                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                    "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                   }
                 }
               ],